Changeset 20139

Timestamp:

Oct 13, 2008, 6:16:12 PM (18 years ago)

Author:

Paul Price

Message:

Fixing problems from convolution in-place.

File:

• trunk/psModules/src/objects/pmFootprintArrayGrow.c (modified) (3 diffs)

trunk/psModules/src/objects/pmFootprintArrayGrow.c

@@ -3 +3 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-10-14 04:09:05 $
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-10-14 04:16:12 $
  * Copyright 2006 Institute for Astronomy, University of Hawaii
  */
@@ -44 +44 @@
     // Use a separable convolution: should be faster
     idImage = (psImage*)psBinaryOp(idImage, idImage, "MIN", psScalarAlloc(1, PS_TYPE_S32));
-    psImage *grownIdImage = psImageCopy(NULL, idImage, PS_TYPE_MASK);
-    if (!psImageConvolveMask(idImage, grownIdImage, 0x01, 0x01, -r, r, -r, r)) {
+    psImage *idImageMask = psImageCopy(NULL, idImage, PS_TYPE_MASK); // Image with 1 = object
+    psFree(idImage);
+    psImage *grownIdImage = psImageConvolveMask(NULL, grownIdImage, 0x01, 0x01, -r, r, -r, r); // Grown mask
+    if (!grownIdImage) {
         psError(PS_ERR_UNKNOWN, false, "Unable to grow mask.");
         psFree(grownIdImage);
@@ -51 +53 @@
         return NULL;
     }
-    psFree(grownIdImage);
-    grownIdImage = idImage;
+    psFree(idImage);
 #else
     if (r <= 0) {