Changeset 34772 for branches/czw_branch/20120906/psphot/src/psphotSourceSize.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotSourceSize.c (modified) (1 diff)

branches/czw_branch/20120906/psphot/src/psphotSourceSize.c

@@ -675 +675 @@
             return false;
         }
-        psFree(readout->mask);
-        readout->mask = newMask;
+        // Copy the new mask pixel values to the old mask array.  NOTE: we cannot replace
+        // the mask pointer because the source->maskView objects point to the old data
+        // area
+        psImage *oldMask = readout->mask;
+        readout->mask = psImageCopy (readout->mask, newMask, PS_TYPE_IMAGE_MASK);
+        psAssert (oldMask == readout->mask, "should have copied the values in-situ");
+        psFree(newMask);
     }