Changeset 680 for trunk/archive/pslib/include/psImage.h

Timestamp:

May 13, 2004, 3:21:30 PM (22 years ago)

Author:

eugene

Message:

adjusted the type names to the form psS8, psF32, etc

File:

• trunk/archive/pslib/include/psImage.h (modified) (4 diffs)

trunk/archive/pslib/include/psImage.h

@@ -10 +10 @@
 typedef struct psImage {
     psType type;                        ///< image data type and dimension
-    const int nx, ny;                   ///< size of image 
+    const int ncols, nrows;             ///< size of image 
     const int x0, y0;                   ///< data region relative to parent 
     union {
-        float **rows;                   ///< Pointers to floating-point data (default)
-        short int **rows_si;            ///< Pointers to short-integer data
-        int **rows_i;                   ///< Pointers to integer data
-        long int **rows_li;             ///< Pointers to long-integer data
-        unsigned short int **rows_usi;  ///< Pointers to unsigned-short-integer data
-        unsigned int **rows_ui;         ///< Pointers to unsigned-integer data
-        unsigned long int **rows_uli;   ///< Pointers to unsigned-long-integer data
-        float **rows_f;                 ///< Pointers to floating-point data
-        double **rows_d;                ///< Pointers to double-precision data
-        complex float **rows_complex;   ///< Pointers to complex floating-point data
+        psF32 **rows;                   ///< Pointers to floating-point data (default)
+        psS8  **rows_S8;                ///< Pointers to char data
+        psS16 **rows_S16;               ///< Pointers to short-integer data
+        psS32 **rows_S32;               ///< Pointers to integer data
+        psS64 **rows_S64;               ///< Pointers to long-integer data
+        psU8  **rows_U8;                ///< Pointers to unsigned-char data
+        psU16 **rows_U16;               ///< Pointers to unsigned-short-integer data
+        psU32 **rows_U32;               ///< Pointers to unsigned-integer data
+        psU64 **rows_U64;               ///< Pointers to unsigned-long-integer data
+        psF32 **rows_F32;               ///< Pointers to floating-point data
+        psF64 **rows_F64;               ///< Pointers to double-precision data
+        psC32 **rows_C32;               ///< Pointers to complex floating-point data
     } rows;
     const struct psImage *parent;       ///< parent, if a subimage 
@@ -38 +40 @@
 /// Create an image of the specified size and type.
 psImage *
-psImageAlloc (int nx,                   ///< image width 
-              int ny,                   ///< image height 
+psImageAlloc (int width,                ///< image width (ncols)
+              int height,               ///< image height (nrows)
               psElemType type)          ///< image data type 
 ;
@@ -46 +48 @@
 psImage *
 psImageSubset(const psImage *image,     ///< parent image 
-              int nx,                   ///< subimage width (<= image.nx - x0)  
-              int ny,                   ///< subimage width (<= image.ny - y0)  
-              int x0,                   ///< subimage x-offset (0 <= x0 < nx)   
-              int y0)                   ///< subimage y-offset (0 <= y0 < ny)   
+              int width,                ///< subimage width (<= image.ncols - col0)  
+              int height,               ///< subimage height (<= image.nrows - row0)  
+              int x0,                   ///< subimage starting col (0 <= col0 < ncols)   
+              int y0)                   ///< subimage starting row (0 <= row0 < nrows)   
 ;
 
@@ -77 +79 @@
              int x,                     ///< starting x coord of region to slice
              int y,                     ///< starting y coord of region to slice
-             int nx,                    ///< width of region in x
-             int ny,                    ///< width of region in y
+             int nx,                    ///< length of region in x
+             int ny,                    ///< length of region in y
              int direction,             ///< direction of vector along slice
              const psStats *stats)      ///< defines statistics used to find output values