Changeset 2204 for trunk/psLib/src/image/psImageIO.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/src/image/psImageIO.c (modified) (5 diffs)

trunk/psLib/src/image/psImageIO.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-02 02:08:00 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15 +15 @@
 #include <fitsio.h>
 #include <unistd.h>
-#include <stdbool.h>
 
 #include "psImageIO.h"
@@ -24 +23 @@
 
 psImage* psImageReadSection(psImage* output,
-                            int col,
-                            int row,
-                            int numCols,
-                            int numRows,
-                            int z,
+                            psS32 col,
+                            psS32 row,
+                            psS32 numCols,
+                            psS32 numRows,
+                            psS32 z,
                             char *extname,
-                            int extnum,
+                            psS32 extnum,
                             char *filename)
 {
     fitsfile *fptr = NULL;      /* Pointer to the FITS file */
-    int status = 0;             /* CFITSIO file vars */
-    int nAxis = 0;
-    int anynull = 0;
-    int bitPix = 0;             /* Pixel type */
-    long nAxes[3];
-    long firstPixel[3];         /* lower-left corner of image subset */
-    long lastPixel[3];          /* upper-right corner of image subset */
-    long increment[3];          /* increment for image subset */
+    psS32 status = 0;             /* CFITSIO file vars */
+    psS32 nAxis = 0;
+    psS32 anynull = 0;
+    psS32 bitPix = 0;             /* Pixel type */
+    psS64 nAxes[3];
+    psS64 firstPixel[3];         /* lower-left corner of image subset */
+    psS64 lastPixel[3];          /* upper-right corner of image subset */
+    psS64 increment[3];          /* increment for image subset */
     char fitsErr[80] = "";      /* CFITSIO error message string */
-    int hduType = IMAGE_HDU;
-    int fitsDatatype = 0;
-    int datatype = 0;
+    psS32 hduType = IMAGE_HDU;
+    psS32 fitsDatatype = 0;
+    psS32 datatype = 0;
 
     if (filename == NULL) {
@@ -228 +227 @@
 }
 
-bool psImageWriteSection(psImage* input,
-                         int col0,
-                         int row0,
-                         int z,
-                         char *extname,
-                         int extnum,
-                         char *filename)
+psBool psImageWriteSection(psImage* input,
+                           psS32 col0,
+                           psS32 row0,
+                           psS32 z,
+                           char *extname,
+                           psS32 extnum,
+                           char *filename)
 {
-    int numCols = 0;
-    int numRows = 0;
-
-    int status = 0;             /* CFITSIO status */
+    psS32 numCols = 0;
+    psS32 numRows = 0;
+
+    psS32 status = 0;             /* CFITSIO status */
     fitsfile *fptr = NULL;      /* pointer to the FITS file */
-    long nAxes[3];              /* Image axis vars */
-    long firstPixel[3];         /* First Pixel to read */
-    long lastPixel[3];          /* Last Pixel to read */
+    psS64 nAxes[3];              /* Image axis vars */
+    psS64 firstPixel[3];         /* First Pixel to read */
+    psS64 lastPixel[3];          /* Last Pixel to read */
     char fitsErr[80];           /* FITSIO message string */
-    int datatype = 0;           /* the datatype of the image */
-    int bitPix = 0;             /* FITS bitPix value */
-    int hduType = IMAGE_HDU;    /* the HDU type (image,table, etc.) */
+    psS32 datatype = 0;           /* the datatype of the image */
+    psS32 bitPix = 0;             /* FITS bitPix value */
+    psS32 hduType = IMAGE_HDU;    /* the HDU type (image,table, etc.) */
     double bscale = 1.0;
     double bzero = 0.0;
-    bool createNewHDU = false;
+    psBool createNewHDU = false;
 
     /* need a valid image to write */
@@ -336 +335 @@
             }
         } else {
-            int numHDUs = 0;
+            psS32 numHDUs = 0;
 
             fits_get_num_hdus(fptr, &numHDUs, &status);