Changeset 206 for trunk/archive/pslib/include/psImages.h

Timestamp:

Mar 10, 2004, 12:07:04 PM (22 years ago)

Author:

eugene

Message:

cleaned up types / implementation for math operations

File:

• trunk/archive/pslib/include/psImages.h (modified) (1 diff)

trunk/archive/pslib/include/psImages.h

@@ -11 +11 @@
  */
 
-/// image data type names.
-typedef enum { 
-    PS_U8  = 1, 
-    PS_U16 = 2, 
-    PS_U32 = 3, 
-    PS_F32 = 4, 
-    PS_F64 = 5, 
-} PS_IMAGE_DEPTH;
-
-PS_DECLARE_ARRAY_TYPE(psFloatArray);    ///< Declare an array of real vectors (psFloatArrayArray).
-
-typedef unsigned char  psU8;            ///< BITPIX 8   (unsigned short)
-typedef unsigned short psU16;           ///< BITPIX 16  (unsigned int)
-typedef unsigned long  psU32;           ///< BITPIX 32  (unsigned long)
-typedef float          psF32;           ///< BITPIX -32 (float)
-typedef double         psF64;           ///< BITPIX -64 (double)
-
 /// basic image data structure.
 typedef struct psImage {
+    psType type;                        ///< image data type and dimension
     int nx, ny;                         ///< size of image 
     int x0, y0;                         ///< data region relative to parent 
-    PS_IMAGE_DEPTH depth;               ///< type of image 
     psF32 **rows;                       ///< == rows_f32 
     psU8  **rows_u8;                    ///< pointers to psU8 data