r10902: Automated commit for Debian build of ctsim upstream-version-4.4.4

[ctsim.git] / include / scanner.h

diff --git a/include/scanner.h b/include/scanner.h
index cad4be01e951b45fc5280b6255409e83c075e0f0..8fdf386c6ce087a2133b1081e765c6fb6bc9919d 100644 (file)
--- 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$
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -68,11 +68,11 @@ class DetectorArray
 class Scanner
 {
  public:
-  static const int Scanner::GEOMETRY_INVALID;
-  static const int Scanner::GEOMETRY_PARALLEL;
-  static const int Scanner::GEOMETRY_EQUILINEAR;
-  static const int Scanner::GEOMETRY_EQUIANGULAR;
-  static const int Scanner::GEOMETRY_LINOGRAM;
+  static const int GEOMETRY_INVALID;
+  static const int GEOMETRY_PARALLEL;
+  static const int GEOMETRY_EQUILINEAR;
+  static const int GEOMETRY_EQUIANGULAR;
+  static const int GEOMETRY_LINOGRAM;
 
   
   Scanner (const Phantom& phm, const char* const geometryName, int nDet, 
@@ -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);