Changeset 11254

Timestamp:

Jan 23, 2007, 5:00:22 PM (19 years ago)

Author:

Paul Price

Message:

Was producing corruption of the bias list by freeing an image while
it was on the list, and then freeing the list.

File:

• trunk/psModules/src/camera/pmHDUGenerate.c (modified) (4 diffs)

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -272 +272 @@
 // Paste the source image into the target, according to the provided region.  The source is then updated to
 // reference the region within the target.
-static void pasteImage(psImage *target, // Target image, into which the paste is made
-                       psImage **sourcePtr,// Source image, from which the paste is made, and then changed
-                       psRegion *region // Image section into which to paste
-                      )
-{
-    psImage *source = *sourcePtr;       // Dereference pointer, for convenience
+static psImage *pasteImage(psImage *target, // Target image, into which the paste is made
+                           psImage *source,// Source image, from which the paste is made, and then changed
+                           psRegion *region // Image section into which to paste
+                          )
+{
     if (source->numCols != region->x1 - region->x0 || source->numRows != region->y1 - region->y0) {
         psString regionString = psRegionToString(*region);
@@ -287 +286 @@
 
     // Reference the HDU version, so that subsequent changes will touch the HDU
-    psFree(source);
-    *sourcePtr = psImageSubset(target, *region);
-
-    return;
+    return psImageSubset(target, *region);
 }
 
@@ -404 +400 @@
 
                 if (readout->image) {
-                    pasteImage(hduImages->data[i], &readout->image, trimsec);
+                    psImage *new = pasteImage(hduImages->data[i], readout->image, trimsec);
+                    psFree(readout->image);
+                    readout->image = new;
                 }
                 if (readout->mask) {
-                    pasteImage(hduMasks->data[i], &readout->mask, trimsec);
+                    psImage *new = pasteImage(hduMasks->data[i], readout->mask, trimsec);
+                    psFree(readout->mask);
+                    readout->mask = new;
                 }
                 if (readout->weight) {
-                    pasteImage(hduWeights->data[i], &readout->weight, trimsec);
+                    psImage *new = pasteImage(hduWeights->data[i], readout->weight, trimsec);
+                    psFree(readout->weight);
+                    readout->weight = new;
                 }
 
@@ -424 +426 @@
                 while ((bias = psListGetAndIncrement(biasIter)) &&
                         (biassec = psListGetAndIncrement(biassecsIter))) {
-                    pasteImage(hduImages->data[i], &bias, biassec);
-                    psListAdd(newBias, PS_LIST_TAIL, bias);
+                    psImage *new = pasteImage(hduImages->data[i], bias, biassec);
+                    psListAdd(newBias, PS_LIST_TAIL, new);
                 }
                 psFree(biasIter);