Changeset 18900

Timestamp:

Aug 4, 2008, 3:51:57 PM (18 years ago)

Author:

Paul Price

Message:

Removing need for additional image allocation.

File:

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

trunk/psModules/src/objects/pmFootprintArrayGrow.c

@@ -3 +3 @@
  * @author RHL, Princeton & IfA; EAM, IfA
  *
- * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-08-05 01:36:17 $
+ * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-08-05 01:51:57 $
  * 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 *maskImage = psImageCopy(NULL, idImage, PS_TYPE_MASK);
-    psImage *grownIdImage = psImageConvolveMask(NULL, maskImage, 0xff, 0xff, -1, 1, -1, 1);
-    psFree(maskImage);
+    psImage *grownIdImage = psImageCopy(NULL, idImage, PS_TYPE_MASK);
+    if (!psImageConvolveMask(grownIdImage, grownIdImage, 0x0f, 0xf0, -1, 1, -1, 1)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to grow mask.");
+        psFree(grownIdImage);
+        psFree(idImage);
+        return NULL;
+    }
 #else
     if (r <= 0) {