Changeset 3301

Timestamp:

Feb 22, 2005, 9:38:44 AM (21 years ago)

Author:

desonia

Message:

Bug #307 - numElementsSquared should not overflow given large images.

Location:

trunk/psLib/src

Files:

• fft/psImageFFT.c (modified) (5 diffs)
• image/psImageFFT.c (modified) (5 diffs)

trunk/psLib/src/fft/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-22 19:38:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -375 +375 @@
     psU32 numCols;
     psU32 numRows;
-    psS32 numElementsSquared;
 
     if (in == NULL) {
@@ -385 +384 @@
     numCols = in->numCols;
     numRows = in->numRows;
-    numElementsSquared = numCols * numCols * numRows * numRows;
 
     if (type == PS_TYPE_C32) {
@@ -392 +390 @@
         psF32 real;
         psF32 imag;
+        psF32 numElementsSquared = numCols * numCols * numRows * numRows;
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32);
@@ -409 +408 @@
         psF64 real;
         psF64 imag;
+        psF64 numElementsSquared = numCols * numCols * numRows * numRows;
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64);

trunk/psLib/src/image/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-22 19:38:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -375 +375 @@
     psU32 numCols;
     psU32 numRows;
-    psS32 numElementsSquared;
 
     if (in == NULL) {
@@ -385 +384 @@
     numCols = in->numCols;
     numRows = in->numRows;
-    numElementsSquared = numCols * numCols * numRows * numRows;
 
     if (type == PS_TYPE_C32) {
@@ -392 +390 @@
         psF32 real;
         psF32 imag;
+        psF32 numElementsSquared = numCols * numCols * numRows * numRows;
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32);
@@ -409 +408 @@
         psF64 real;
         psF64 imag;
+        psF64 numElementsSquared = numCols * numCols * numRows * numRows;
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F64);