Changeset 12187

Timestamp:

Mar 2, 2007, 12:19:21 PM (19 years ago)

Author:

Paul Price

Message:

Adding psImageConvolveMask

Location:

trunk/psLib/src/imageops

Files:

• psImageConvolve.c (modified) (3 diffs)
• psImageConvolve.h (modified) (2 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-03-02 21:48:12 $
+/// @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-03-02 22:19:21 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -274 +274 @@
 }
 
-psImage *psImageMaskConvolve(const psImage *mask, psMaskType maskVal, const psKernel *kernel)
+psImage *psImageConvolveMask(const psImage *mask, psMaskType maskVal, const psKernel *kernel)
 {
     PS_ASSERT_IMAGE_NON_NULL(mask, NULL);
@@ -290 +290 @@
     int numCols = mask->numCols;        // Number of columns
 
+    psImage *out = psImageAlloc(numCols, numRows, PS_TYPE_MASK); // Output mask
+
+    // Dereference mask images
     psMaskType **maskData = mask->data.PS_TYPE_MASK_DATA;
-    psImage *out = psImageAlloc(numCols, numRows, PS_TYPE_MASK);
-    psImageInit(out, 0);
-
-    for (int kRow = yMin; kRow <= yMax; kRow++) {
-        for (int kCol = xMin; kCol <= xMax; kCol++) {
-            psMaskType kValue = kernel->kernel[kRow][kCol]; // Value of the kernel
-            if (kValue == 0) {
+    psMaskType **outData = out->data.PS_TYPE_MASK_DATA;
+
+    // Propagate the non-masked values
+    for (int row = 0; row < numRows; row++) {
+        for (int col = 0; col < numCols; col++) {
+            outData[row][col] = maskData[row][col] & ~maskVal;
+        }
+    }
+
+    for (int row = 0; row < numRows; row++) {
+        for (int col = 0; col < numCols; col++) {
+            if (maskData[row][col] & maskVal) {
+                // It's already masked --- move on
                 continue;
             }
-            for (int row = PS_MAX(kRow, 0); row < PS_MIN(numRows, numRows - kRow); row++) {
-                for (int col = PS_MAX(kCol, 0); col < PS_MIN(numCols, numCols - kCol); col++) {
-                    if (maskData[row][col] & maskVal) {
-                        out->data.PS_TYPE_MASK_DATA[row + kRow][col + kCol] = maskVal;
-                    }
+            psMaskType pixel = 0;       // New pixel value
+            for (int kRow = PS_MAX(yMin, -row); kRow <= PS_MIN(yMax, numRows - row - 1); kRow++) {
+                for (int kCol = PS_MAX(xMin, -col); kCol <= PS_MIN(xMax, numCols - col - 1); kCol++) {
+                    pixel |= maskData[row + kRow][col + kCol] & maskVal;
                 }
             }
+            outData[row][col] |= pixel;
         }
     }

trunk/psLib/src/imageops/psImageConvolve.h

@@ -5 +5 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-02 21:05:52 $
+ * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-03-02 22:19:21 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -126 +126 @@
 );
 
+/// Convolve a mask image with a kernel
+///
+/// Returns a mask, grown by the supplied kernel.  Only those pixels specified by the maskVal are grown; the
+/// rest are simply propagated.
+psImage *psImageConvolveMask(const psImage *mask, psMaskType maskVal, const psKernel *kernel);
+
+
 /// Smooths an image by parts using 1D Gaussian independently in x and y.
 ///