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

Timestamp:

Feb 8, 2007, 1:56:02 PM (19 years ago)

Author:

Paul Price

Message:

Fixing memory corruption issue due to confusing columns and rows in the final copy.

File:

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

trunk/psLib/src/fft/psImageFFT.c

@@ -6 +6 @@
 /// @author Robert DeSonia, MHPCC
 ///
-/// @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-02-08 04:17:58 $
+/// @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-02-08 23:56:02 $
 ///
 /// Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -129 +129 @@
     psF32 *target = psAlloc(2 * numCols * numRows * PSELEMTYPE_SIZEOF(PS_TYPE_F32)); // Target for FFTW
     fftwf_complex *in = fftwf_malloc(numCols * numRows * sizeof(fftwf_complex)); // Input data
+
     for (int y = 0, index = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; index++, x++) {
@@ -156 +157 @@
     // while the output doesn't.
     for (int y = 0, index = 0; y < numRows; y++, index += origCols) {
-        memcpy(&(*out)->data.F32[y][0], &target[index], numRows * PSELEMTYPE_SIZEOF(PS_TYPE_F32));
+        memcpy(&(*out)->data.F32[y][0], &target[index], numCols * PSELEMTYPE_SIZEOF(PS_TYPE_F32));
     }
     psFree(target);