X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fscanner.h;fp=include%2Fscanner.h;h=eba02d43b805bf2646b8f5118c97205ac42916f3;hb=87f312d59cabca5080b481a20314601ea476c4be;hp=cad4be01e951b45fc5280b6255409e83c075e0f0;hpb=f667aa59ee6fe8f78637b29a23846e049fb16121;p=ctsim.git diff --git a/include/scanner.h b/include/scanner.h index cad4be0..eba02d4 100644 --- a/include/scanner.h +++ b/include/scanner.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: scanner.h,v 1.23 2003/04/01 19:49:41 kevin Exp $ +** $Id: scanner.h,v 1.24 2003/07/04 21:39:39 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify @@ -111,8 +111,8 @@ class Scanner int geometry() const {return m_idGeometry;} static int getGeometryCount() {return s_iGeometryCount;} - static const char** getGeometryNameArray() {return s_aszGeometryName;} - static const char** getGeometryTitleArray() {return s_aszGeometryTitle;} + static const char* const* getGeometryNameArray() {return s_aszGeometryName;} + static const char* const* getGeometryTitleArray() {return s_aszGeometryTitle;} static int convertGeometryNameToID (const char* const geometryName); static const char* convertGeometryIDToName (const int idGeometry); static const char* convertGeometryIDToTitle (const int idGeometry); @@ -165,8 +165,8 @@ class Scanner double m_dTextHeight; #endif - static const char* s_aszGeometryName[]; - static const char* s_aszGeometryTitle[]; + static const char* const s_aszGeometryName[]; + static const char* const s_aszGeometryTitle[]; static const int s_iGeometryCount; void projectSingleView (const Phantom& phm, DetectorArray& darray, const double xd1, const double yd1, const double xd2, const double yd2, const double xs1, const double ys1, const double xs2, const double ys2, const double dDetAngle);