Changeset 17329

Timestamp:

Apr 4, 2008, 4:46:10 PM (18 years ago)

Author:

Paul Price

Message:

Shouldn't multiply by the maskVal --- it's set to 1 or zero.
Shouldn't free output image.

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (5 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2008-04-04 22:44:56 $
+/// @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2008-04-05 02:46:10 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -418 +418 @@
     int numRows = mask->numRows, numCols = mask->numCols; // Size of image
 
-    if (!psMemIncrRefCounter(out)) {
-        out = psImageAlloc(numCols, numRows, PS_TYPE_MASK);
-    }
-
     psImage *onoff = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Pixels on or off
     psImageInit(onoff, 0);
@@ -439 +435 @@
     if (!convolved) {
         psError(PS_ERR_UNKNOWN, false, "Unable to convolve mask.");
-        psFree(out);
         return NULL;
     }
-
-    thresh *= maskVal;
 
     if (!setVal) {
@@ -449 +442 @@
     }
 
+    if (!out) {
+        out = psImageAlloc(numCols, numRows, PS_TYPE_MASK);
+    }
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
@@ -457 +453 @@
 
     psFree(convolved);
-    psFree(out);
 
     return out;