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

Timestamp:

May 20, 2004, 6:12:37 PM (22 years ago)

Author:

eugene

Message:

substantial API changes based on change to PSLib SDRS

File:

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

trunk/archive/pslib/include/psImage.h

@@ -13 +13 @@
     const int x0, y0;                   ///< data region relative to parent 
     union {
-        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;
+        psS8  **S8;                     ///< Pointers to char data
+        psS16 **S16;                    ///< Pointers to short-integer data
+        psS32 **S32;                    ///< Pointers to integer data
+        psS64 **S64;                    ///< Pointers to long-integer data
+        psU8  **U8;                     ///< Pointers to unsigned-char data
+        psU16 **U16;                    ///< Pointers to unsigned-short-integer data
+        psU32 **U32;                    ///< Pointers to unsigned-integer data
+        psU64 **U64;                    ///< Pointers to unsigned-long-integer data
+        psF32 **F32;                    ///< Pointers to floating-point data
+        psF64 **F64;                    ///< Pointers to double-precision data
+        psC32 **C32;                    ///< Pointers to complex floating-point data
+    } data;
     const struct psImage *parent;       ///< parent, if a subimage 
     int Nchildren;                      ///< number of subimages 
@@ -215 +214 @@
 ;
 
-/// Read only header from image file.
-psMetadata *
-psImageReadHeader(psMetadata *output,   ///< read data to this structure
-                  const char *extname,  ///< MEF extension name ("PHU" for primary header)
-                  int extnum,           ///< MEF extension number (-1 for "PHU", 0 : Nextend - 1)
-                  const char *filename) ///< file to read from
-;
-
-/// Read only header from image file descriptor.
-psMetadata *
-psImageFReadHeader(psMetadata *output,  ///< read data to this structure
-                   const char *extname, ///< MEF extension name ("PHU" for primary header)
-                   int extnum,          ///< MEF extension number (-1 for "PHU", 0 : Nextend - 1)
-                   FILE *f)             ///< file descriptor to read from
-;
-
 /*** basic pixel manipulations ***/
 /// Clip image values outside of range to given values.  Return number of clipped pixels.
@@ -260 +243 @@
 # endif
 /* image overlay operations 
-    PS_OVERLAY_EQUALS   = '=', 
-    PS_OVERLAY_ADD      = '+', 
-    PS_OVERLAY_SUBTRACT = '-', 
-    PS_OVERLAY_MULTIPLY = '*', 
-    PS_OVERLAY_DIVIDE   = '/', 
+   PS_OVERLAY_EQUALS   = '=', 
+   PS_OVERLAY_ADD      = '+', 
+   PS_OVERLAY_SUBTRACT = '-', 
+   PS_OVERLAY_MULTIPLY = '*', 
+   PS_OVERLAY_DIVIDE   = '/', 
 */