r237: *** empty log message ***

[ctsim.git] / include / array2dfile.h

diff --git a/include/array2dfile.h b/include/array2dfile.h
index 6b6c5c25e94b366ed629e7911b46223571a5d6af..1c40c05b95b6a1f60558520d0d677c049b1ddce4 100644 (file)
--- a/include/array2dfile.h
+++ b/include/array2dfile.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: array2dfile.h,v 1.5 2000/12/04 02:52:57 kevin Exp $
+**  $Id: array2dfile.h,v 1.6 2000/12/04 03:04:06 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -47,9 +47,11 @@ using namespace std;
 class Array2dFileLabel
 {
 public:
-    static const int L_EMPTY = 0;
-    static const int L_HISTORY = 1;
-    static const int L_USER = 2;
+    enum {
+      L_EMPTY = 0,
+      L_HISTORY = 1,
+      L_USER = 2,
+    };
 
     Array2dFileLabel(); 
 
@@ -112,15 +114,17 @@ private:
 class Array2dFile 
 {
 public:
-  static const int PIXEL_INVALID = 0;
-  static const int PIXEL_INT8 = 1;
-  static const int PIXEL_UINT8 = 2;
-  static const int PIXEL_INT16 = 3;
-  static const int PIXEL_UINT16 = 4;
-  static const int PIXEL_INT32 = 5;
-  static const int PIXEL_UINT32 = 6;
-  static const int PIXEL_FLOAT32 = 7;
-  static const int PIXEL_FLOAT64 = 8;
+  enum {
+    PIXEL_INVALID = 0,
+    PIXEL_INT8 = 1,
+    PIXEL_UINT8 = 2,
+    PIXEL_INT16 = 3,
+    PIXEL_UINT16 = 4,
+    PIXEL_INT32 = 5,
+    PIXEL_UINT32 = 6,
+    PIXEL_FLOAT32 = 7,
+    PIXEL_FLOAT64 = 8,
+  };
 
   Array2dFile (int nx, int ny, int pixelSize, int pixelFormat = PIXEL_INVALID);
   Array2dFile (void);