Changeset 3702 for trunk/psLib/test/image/tst_psImageFFT.c

Timestamp:

Apr 14, 2005, 2:12:09 PM (21 years ago)

Author:

desonia

Message:

fixed image FFT and image convolution. The FFTW call had the wrong order
of dimensions, and the scaling was incorrect.

File:

• trunk/psLib/test/image/tst_psImageFFT.c (modified) (4 diffs)

trunk/psLib/test/image/tst_psImageFFT.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:42 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:09 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -68 +68 @@
 
     // 1. assign a image to a radial sinisoid
-    GENIMAGE(img,m,n,F32, sinf((32.0f-row)/16.0f*PS_PI)+sinf((64.0f-col)/32.0f*PS_PI));
+    GENIMAGE(img,m,n,F32, sinf((32.0f-row)/32.0f*PS_PI)+sinf((64.0f-col)/64.0f*PS_PI));
 
     // 2. perform a forward transform
@@ -88 +88 @@
             psF32 mag = cabsf(img2Row[col])/m/n;
             if (mag > 0.1f) {
-                // must be (0,1) or (0,n-1) or (1,0) or (n-1,0)
+                // must be (0,1) or (0,n-1) or (1,0) or (m-1,0)
                 if (! (col == 0 && (row == 1 || row == n-1))
-                        && ! (row == 0 && (col==1 || col == n-1)) ) {
+                        && ! (row == 0 && (col==1 || col == m-1)) ) {
                     psError(PS_ERR_UNKNOWN, true,"Result invalid at %d,%d (%.2f)",col,row,mag);
                     return 3;
@@ -96 +96 @@
             } else
                 if ( (col == 0 && (row == 1 || row == n-1))
-                        || (row == 0 && (col==1 || col == n-1)) ) {
+                        || (row == 0 && (col==1 || col == m-1)) ) {
                     psError(PS_ERR_UNKNOWN, true,"Result invalid at %d,%d (%.2f)",col,row,mag);
                     return 4;