Changeset 17183 for branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c

Timestamp:

Mar 28, 2008, 2:15:38 PM (18 years ago)

Author:

Paul Price

Message:

Adding error check.

File:

• branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c (modified) (2 diffs)

branches/pap_branch_080320/ppMerge/src/ppMergeLoop.c

@@ -168 +168 @@
                             psFree(readouts); \
                             psFree(outRO); \
-                            psFree(view); \
-                            return false; \
+                            goto ERROR; \
                         } \
                     }
@@ -184 +183 @@
                 switch (type) {
                   case PPMERGE_TYPE_SHUTTER:
-                    pmShutterCorrectionGenerate(outRO, NULL, readouts, shutterRef,
-                                                shutters->data[cellNum], iter, rej,
-                                                maskVal);
+                    if (!pmShutterCorrectionGenerate(outRO, NULL, readouts, shutterRef,
+                                                     shutters->data[cellNum], iter, rej, maskVal)) {
+                        psFree(readouts);
+                        psFree(outRO);
+                        goto ERROR;
+                    }
                     break;
                   case PPMERGE_TYPE_DARK:
-                    pmDarkCombine(outCell, readouts, darkOrdinates, darkNorm, iter, rej, maskVal);
+                    if (!pmDarkCombine(outCell, readouts, darkOrdinates, darkNorm, iter, rej, maskVal)) {
+                        psFree(readouts);
+                        psFree(outRO);
+                        goto ERROR;
+                    }
                     break;
                   case PPMERGE_TYPE_BIAS:
                   case PPMERGE_TYPE_FLAT:
                   case PPMERGE_TYPE_FRINGE:
-                    pmReadoutCombine(outRO, readouts, zeros, scales, combination);
+                    if (!pmReadoutCombine(outRO, readouts, zeros, scales, combination)) {
+                        psFree(readouts);
+                        psFree(outRO);
+                        goto ERROR;
+                    }
                     break;
                   default: