Changeset 9997 for trunk/psModules/src/detrend/pmShutterCorrection.c

Timestamp:

Nov 14, 2006, 4:50:13 PM (19 years ago)

Author:

Paul Price

Message:

Fixing multiple frees, and mask for statistics.

File:

• trunk/psModules/src/detrend/pmShutterCorrection.c (modified) (4 diffs)

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -400 +400 @@
             continue;
         }
-        images->data[i] = image;
+        images->data[i] = psMemIncrRefCounter(image);
         if (image->type.type != PS_TYPE_F32) {
             psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Bad type for image: %x\n", image->type.type);
@@ -429 +429 @@
                 goto MEASURE_ERROR;
             }
-            masks->data[i] = mask;
+            masks->data[i] = psMemIncrRefCounter(mask);
 
             if (mask->type.type != PS_TYPE_U8) {
@@ -452 +452 @@
                 goto MEASURE_ERROR;
             }
-            masks->data[i] = mask;
-
-            if (mask->type.type != PS_TYPE_F32) {
+            weights->data[i] = psMemIncrRefCounter(weight);
+
+            if (weight->type.type != PS_TYPE_F32) {
                 psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Bad type for weights: %x\n", weight->type.type);
                 goto MEASURE_ERROR;
@@ -484 +484 @@
             psRegion *region = regions->data[j]; // Region of interest
             psImage *subImage = psImageSubset(image, *region); // Sub-image
-            if (!psImageStats(stats, subImage, masks->data[i], maskVal)) {
+            psImage *subMask = NULL;
+            if (mask) {
+                subMask = psImageSubset(mask, *region);
+            }
+            if (!psImageStats(stats, subImage, subMask, maskVal)) {
                 psString regionString = psRegionToString(*region);
                 psWarning("Unable to measure sample statistics at %s in image %ld.\n",