Changeset 10589 for trunk/ppImage/src/ppImageRebinReadout.c

Timestamp:

Dec 8, 2006, 2:43:04 PM (20 years ago)

Author:

Paul Price

Message:

Adding error checking; only close files after all operations are pau.

File:

• trunk/ppImage/src/ppImageRebinReadout.c (modified) (3 diffs)

trunk/ppImage/src/ppImageRebinReadout.c

@@ -11 +11 @@
 
     pmFPAfile *inFile = psMetadataLookupPtr (NULL, config->files, inName);
-    if (inFile == NULL) return NULL;
+    if (inFile == NULL) return false;
 
     pmFPAfile *outFile = psMetadataLookupPtr (NULL, config->files, outName);
-    if (outFile == NULL) return NULL;
+    if (outFile == NULL) return false;
 
     // XXX double check that chip != -1?
@@ -20 +20 @@
     pmChip *inChip = pmFPAviewThisChip (view, inFile->fpa);
     pmChip *outChip = pmFPAviewThisChip (view, outFile->fpa);
-    pmChipCopyStructure (outChip, inChip, outFile->xBin, outFile->yBin);
+    if (!pmChipCopyStructure (outChip, inChip, outFile->xBin, outFile->yBin)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to copy chip structure.");
+        return false;
+    }
 
     while ((cell = pmFPAviewNextCell (view, inFile->fpa, 1)) != NULL) {
@@ -56 +59 @@
         binItem->data.S32 = yBin * outFile->yBin;
     }
+
     return true;
 }