Changeset 34418 for trunk/psphot/src/psphotSourceSize.c

Timestamp:

Sep 7, 2012, 10:51:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from eam_branch/ipp-20120905: add satstar profile to psphotStackReadout; skip negative fluxes in standard psphotReadout; replace mask pixel values when growing the CR mask; mask cores of 1st pass sources to avoid excessively close detections; add SUBTRACT_SATSTAR_PROFILE to psphot recipe

Location:

trunk

Files:

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

trunk/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);
     }