Changeset 14713 for trunk/psModules/src/imcombine/pmSubtractionMatch.c

Timestamp:

Aug 30, 2007, 12:12:12 PM (19 years ago)

Author:

Paul Price

Message:

Putting pointer declarations early, since in the event of an error
they are all freed after a "goto". That means that they all need to
be declared before the first "goto".

File:

• trunk/psModules/src/imcombine/pmSubtractionMatch.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -212 +212 @@
     }
 
+    // Putting important variable declarations here, since they are freed after a "goto" if there is an error.
+    psImage *subMask = NULL;            // Mask for subtraction
+    psArray *stamps = NULL;             // Stamps for matching PSF
+    psRegion *region = NULL;            // Iso-kernel region
+    psString regionString = NULL;       // String for region
+    psVector *solution = NULL;          // Solution to match PSF
+    pmSubtractionKernels *kernels = NULL; // Kernel basis functions
+
     // Read stamps from file
     psArray *stampsData = NULL;         // Stamps data read from file
@@ -240 +248 @@
     memCheck("start");
 
-    // Mask for subtraction
-    psImage *subMask = pmSubtractionMask(reference->mask, inMask, maskBad, size, footprint);
+    subMask = pmSubtractionMask(reference->mask, inMask, maskBad, size, footprint);
 
     memCheck("mask");
 
-
-    psArray *stamps = NULL;             // Stamps for matching PSF
-
-    pmSubtractionKernels *kernels = NULL; // Kernel basis functions
     if (optimum && (type == PM_SUBTRACTION_KERNEL_ISIS || type == PM_SUBTRACTION_KERNEL_GUNK)) {
         if (!getStamps(&stamps, stampsData, reference, input, subMask, weight, NULL,
@@ -277 +280 @@
     psMetadataAddPtr(convolved->analysis, PS_LIST_TAIL, "SUBTRACTION.KERNEL", PS_DATA_UNKNOWN,
                      "Subtraction kernels", kernels);
-    psVector *solution = NULL;          // Solution to match PSF
-
 
     memCheck("kernels");
 
+    // Get region of interest
     int xRegions = 1, yRegions = 1;     // Number of iso-kernel regions
     float xRegionSize = 0, yRegionSize = 0; // Size of iso-kernel regions
-    psRegion *region = NULL;            // Iso-kernel region
-    psString regionString = NULL;       // String for region
     if (isfinite(regionSize) && regionSize != 0.0) {
         xRegions = numCols / regionSize + 1;
@@ -481 +481 @@
     psFree(solution);
     psFree(stampsData);
+    psFree(stamps);
     return false;
 }