Changeset 18590

Timestamp:

Jul 16, 2008, 5:34:22 PM (18 years ago)

Author:

Paul Price

Message:

Making UpdateImage look like WriteImage.

File:

• trunk/psLib/src/fits/psFitsImage.c (modified) (10 diffs)

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-07-16 23:05:06 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-07-17 03:34:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -703 +703 @@
     psFitsCompression *compress = NULL; // FITS compression parameters; to save state
 
+    bool success = true;                // Successful update?
     double bscale = NAN, bzero = NAN;   // Scale and zero point to put in header
     long blank = 0;                     // Blank (undefined) value for image
@@ -710 +711 @@
     if (!diskImage) {
         psError(PS_ERR_UNKNOWN, false, "Unable to convert image to desired disk format.");
-        goto UPDATE_FAIL;
+        success = false;
+        goto UPDATE_DONE;
     }
 
@@ -720 +722 @@
         if (!psFitsSetCompression(fits, PS_FITS_COMPRESS_NONE, NULL, 0, 0, 0)) {
             psError(PS_ERR_IO, false, "Unable to unset compression.");
-            goto UPDATE_FAIL;
+            success = false;
+            goto UPDATE_DONE;
         }
     }
@@ -729 +732 @@
     int dataType;                       // cfitsio data type
     if (!p_psFitsTypeToCfitsio(diskImage->type.type, &bitPix, &cfitsioBzero, &dataType)) {
-        goto UPDATE_FAIL;
+        success = false;
+        goto UPDATE_DONE;
     }
     if (cfitsioBzero != 0.0) {
@@ -751 +755 @@
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
                 _("Current FITS HDU has %ld z-planes, but z-plane %d was specified."), nAxes[2], z);
-        goto UPDATE_FAIL;
+        success = false;
+        goto UPDATE_DONE;
     }
 
@@ -773 +778 @@
                 "Input image [size of %ix%i] at position (%i,%i) does not all lay in the %lix%li FITS image.",
                 numCols, numRows, x0, y0, nAxes[0], nAxes[1]);
-        goto UPDATE_FAIL;
+        success = false;
+        goto UPDATE_DONE;
     }
 
@@ -782 +788 @@
     fits_write_subset(fits->fd, dataType, firstPixel, lastPixel, diskImage->data.V[0], &status);
     if (psFitsError(status, true, "Could not write data to file.")) {
-        goto UPDATE_FAIL;
+        success = false;
+        goto UPDATE_DONE;
     }
 
@@ -790 +797 @@
     ffrdef(fits->fd, &status);
     if (psFitsError(status, true, "Could not re-scan HDU.")) {
-        goto UPDATE_FAIL;
-    }
-
-    psFree(diskImage);
-    return true;
-
-UPDATE_FAIL:
+        success = false;
+        goto UPDATE_DONE;
+    }
+
+UPDATE_DONE:
     psFree(diskImage);
     if (compress) {
@@ -803 +808 @@
         psFree(compress);
     }
-    return false;
+
+    return success;
 }