Changeset 3702 for trunk/psLib/src/imageops/psImageConvolve.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/src/imageops/psImageConvolve.c (modified) (6 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-15 00:12:08 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -398 +398 @@
         }
 
-        psImageWriteSection(paddedImage,0,0,0,NULL,0,"paddedImage.fits");
-
         // pad the kernel to the same size of paddedImage
         psImage* paddedKernel = psImageAlloc(paddedCols,paddedRows,PS_TYPE_KERNEL);
@@ -421 +419 @@
         }
 
-        psImageWriteSection(paddedKernel,0,0,0,NULL,0,"paddedKernel.fits");
-
         psImage* kernelFourier = psImageFFT(NULL, paddedKernel, PS_FFT_FORWARD);
         if (kernelFourier == NULL) {
@@ -440 +436 @@
 
         // convolution in fourier domain is just a pixel-wise multiplication
-        psBinaryOp(inFourier,inFourier,"*",kernelFourier);
+        for (int row = 0; row < paddedRows; row++) {
+            psC32* inRow = inFourier->data.C32[row];
+            psC32* kRow = kernelFourier->data.C32[row];
+            for (int col = 0; col < paddedCols; col++) {
+                inRow[col] *= kRow[col];
+            }
+        }
 
         psImage* complexOut = psImageFFT(NULL, inFourier,
@@ -451 +453 @@
         }
 
-        {
-            psImage* tmp = psImageReal(NULL,complexOut);
-            psImageWriteSection(tmp,0,0,0,NULL,0,"complexOut.fits");
-            psFree(tmp);
-        }
-
         // subset out the padded area now.
         psImage* complexOutSansPad = psImageSubset(complexOut,
@@ -463 +459 @@
 
         out = psImageRecycle(out,numCols,numRows,PS_TYPE_F32);
-        float factor = 1.0f/numCols/numRows;
+        float factor = 1.0f/(float)paddedCols/(float)paddedRows;
         for (psS32 row = 0; row < numRows; row++) {
             psF32* outRow = out->data.F32[row];