Changeset 1241

Timestamp:

Jul 19, 2004, 12:01:19 PM (22 years ago)

Author:

desonia

Message:

changed the return value of psImageWriteSection, as according to bugzilla
bug #106.

Location:

trunk/psLib/src/image

Files:

• psImageIO.c (modified) (13 diffs)
• psImageIO.h (modified) (3 diffs)

trunk/psLib/src/image/psImageIO.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-19 22:01:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -203 +203 @@
 
 
-int psImageWriteSection(psImage* input, int col0,int row0,int z,
-                        char* extname, int extnum, char* filename)
+bool psImageWriteSection(psImage* input, int col0,int row0,int z,
+                         char* extname, int extnum, char* filename)
 {
     int         numCols = 0;
@@ -226 +226 @@
         psError(__func__, "Can not write %s.  Input psImage is NULL.",
                 filename);
-        return 1;
+        return false;
     }
 
@@ -271 +271 @@
         psError(__func__, "psImage datatype (%d) not supported.  File %s not written.",
                 input->type.type,filename);
-        return 1;
+        return false;
     }
 
@@ -281 +281 @@
             psError(__func__,"Could not open file '%s'. FITS error:%s",
                     filename, fitsErr);
-            return 2;
+            return false;
         }
 
@@ -292 +292 @@
                 psError(__func__,"Could not index to '%s' HDU for file %s. (%s)",
                         extname, filename, fitsErr);
-                return 3;
+                return false;
             }
         } else {
@@ -302 +302 @@
                 psError(__func__,"extnum (%d) must not exceed number of HDUs (%d) by more than one.",
                         extnum, numHDUs);
-                return 3;
+                return false;
             } else if (numHDUs == extnum) {
                 createNewHDU = true;
@@ -311 +311 @@
                 psError(__func__,"Could not index to HDU #%d for file %s. (%s)",
                         extnum, filename, fitsErr);
-                return 3;
+                return false;
             }
         }
@@ -322 +322 @@
             psError(__func__,"Could not create file '%s'. (%s)",
                     filename, fitsErr);
-            return 5;
+            return false;
         }
         createNewHDU = true;
@@ -338 +338 @@
             psError(__func__,"Could not create image HDU in FITS file '%s'. %s",
                     filename, fitsErr);
-            return 5;
+            return false;
         }
 
@@ -354 +354 @@
                 psError(__func__,"Could not create EXTNAME keyword in FITS file '%s'. (%s)",
                         filename, fitsErr);
-                return 5;
+                return false;
             }
         }
@@ -373 +373 @@
         psError(__func__, "Could not write image data to '%s'. (%s)",
                 filename, fitsErr);
-        return 6;
+        return false;
     }
 
@@ -379 +379 @@
     (void)fits_close_file(fptr, &status);
 
-    return 0;
+    return true;
 }

trunk/psLib/src/image/psImageIO.h

@@ -9 +9 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-10 01:58:06 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-19 22:01:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 # ifndef PS_IMAGEIO_H
 # define PS_IMAGEIO_H
+
+#include <stdbool.h>
 
 #include "psImage.h"
@@ -54 +56 @@
 /** Read an image or subimage from a FITS file specified by a filename.
  *
- *  return psImage*         NULL if an error, otherwise same as input psImage
+ *  return bool         TRUE is successful, otherwise FALSE.
  */
-int psImageWriteSection(
+bool psImageWriteSection(
     psImage* input,
     /**< the psImage to write */