Changeset 26104

Timestamp:

Nov 12, 2009, 2:24:10 PM (16 years ago)

Author:

Paul Price

Message:

Check for errors when writing convolved images.

Location:

trunk/ppStack/src

Files:

• ppStackConvolve.c (modified) (1 diff)
• ppStackFiles.c (modified) (1 diff)

trunk/ppStack/src/ppStackConvolve.c

@@ -128 +128 @@
         pmHDU *hdu = readout->parent->parent->parent->hdu; // HDU for convolved image
         assert(hdu);
-        ppStackWriteImage(options->convImages->data[i], hdu->header, readout->image, config);
+        if (!ppStackWriteImage(options->convImages->data[i], hdu->header, readout->image, config)) {
+            psError(PS_ERR_IO, false, "Unable to write convolved image %d", i);
+            psFree(fpaList);
+            psFree(cellList);
+            psFree(rng);
+            return false;
+        }
         psMetadata *maskHeader = psMetadataCopy(NULL, hdu->header); // Copy of header, for mask
         pmConfigMaskWriteHeader(config, maskHeader);
-        ppStackWriteImage(options->convMasks->data[i], maskHeader, readout->mask, config);
+        if (!ppStackWriteImage(options->convMasks->data[i], maskHeader, readout->mask, config)) {
+            psError(PS_ERR_IO, false, "Unable to write convolved mask %d", i);
+            psFree(fpaList);
+            psFree(cellList);
+            psFree(rng);
+            psFree(maskHeader);
+            return false;
+        }
         psFree(maskHeader);
-        ppStackWriteImage(options->convVariances->data[i], hdu->header, readout->variance, config);
+        if (!ppStackWriteImage(options->convVariances->data[i], hdu->header, readout->variance, config)) {
+            psError(PS_ERR_IO, false, "Unable to write convolved variance %d", i);
+            psFree(fpaList);
+            psFree(cellList);
+            psFree(rng);
+            return false;
+        }
 #ifdef TESTING
         {

trunk/ppStack/src/ppStackFiles.c

@@ -181 +181 @@
         return false;
     }
-    psFitsClose(fits);
+    if (!psFitsClose(fits)) {
+        psError(PS_ERR_IO, false, "Unable to close FITS image %s.", resolved);
+        psFree(resolved);
+        return false;
+    }
     psFree(resolved);
     return true;