Changeset 21183 for trunk/psLib/src/fft/psImageFFT.c

Timestamp:

Jan 26, 2009, 8:40:07 PM (17 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

File:

• trunk/psLib/src/fft/psImageFFT.c (modified) (4 diffs)

trunk/psLib/src/fft/psImageFFT.c

@@ -6 +6 @@
 /// @author Robert DeSonia, MHPCC
 ///
-/// @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2008-11-06 23:36:20 $
+/// @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2009-01-27 06:39:37 $
 ///
 /// Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -318 +318 @@
 
 
-psImage *psImageConvolveFFT(psImage *out, const psImage *in, const psImage *mask, psMaskType maskVal,
+psImage *psImageConvolveFFT(psImage *out, const psImage *in, const psImage *mask, psImageMaskType maskVal,
                             const psKernel *kernel)
 {
@@ -326 +326 @@
     if (mask) {
         PS_ASSERT_IMAGE_NON_NULL(mask, NULL);
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, NULL);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_IMAGE_MASK, NULL);
         PS_ASSERT_IMAGES_SIZE_EQUAL(mask, in, NULL);
     }
@@ -464 +464 @@
         for (int y = 0; y < numRows; y++) {
             for (int x = 0; x < numCols; x++) {
-                if (mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal) {
+                if (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal) {
                     data[x + paddedCols * y] = 0;
                 }