Changeset 14866 for trunk/psLib/src/imageops/psImageConvolve.c

Timestamp:

Sep 17, 2007, 10:49:51 AM (19 years ago)

Author:

Paul Price

Message:

Adding mask to psImageConvolveFFT, so that masked pixels may be set to the nominated value. This is especially important in removing NaNs in the image being convolved.

File:

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

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-08-30 20:15:23 $
+/// @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-09-17 20:49:51 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -363 +363 @@
 
 psImage *psImageConvolveFFT(const psImage *in,
+                            const psImage *mask,
+                            psMaskType maskVal,
                             const psKernel *kernel,
                             float pad)
@@ -393 +395 @@
     // Generate padded image
     psImage *paddedImage = psImageAlloc(paddedCols,paddedRows,in->type.type); // Padded input image
-    psImageOverlaySection(paddedImage, in, 0, 0, "=");
+    if (mask && maskVal) {
+        for (int y = 0; y < numRows; y++) {
+            for (int x = 0; x < numCols; x++) {
+                paddedImage->data.F32[y][x] = (mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal) ? pad :
+                    in->data.F32[y][x];
+            }
+        }
+    } else {
+        psImageOverlaySection(paddedImage, in, 0, 0, "=");
+    }
     for (int y = 0; y < numRows; y++) {
         for (int x = numCols; x < paddedCols; x++) {