Changeset 4035

Timestamp:

May 25, 2005, 1:08:33 PM (21 years ago)

Author:

gusciora

Message:

Compile bugs in the initial version of pmImageSubtract.c were fixed.

File:

• trunk/psModules/src/pmImageSubtract.c (modified) (12 diffs)

trunk/psModules/src/pmImageSubtract.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 23:00:05 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 23:08:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -395 +395 @@
 XXX: Modify loop so that terms higher than spatialOrder are not computed.
  ******************************************************************************/
-static psImage GenSpatialOrder(psS32 spatialOrder,
-                               psF32 x,
-                               psF32 y)
+static psImage *GenSpatialOrder(psS32 spatialOrder,
+                                psF32 x,
+                                psF32 y)
 {
     psImage *polyValues = psImageAlloc(spatialOrder+1, spatialOrder+1, PS_TYPE_F64);
@@ -407 +407 @@
         for (psS32 j = 0; j < spatialOrder + 1; j++) {
             polyValues->data.F64[i][j] = ySum;
-            ySum*= imageY;
-        }
-        xSum*= imageX;
+            ySum*= y;
+        }
+        xSum*= x;
     }
 
@@ -458 +458 @@
 
     //
-    // The [i][j]-th element of this structure will hold (x^i * y^j) for the stamp.
-    //
-    psImage *polyValues = psImageAlloc(spatialOrder+1, spatialOrder+1, PS_TYPE_F64);
-
-    //
     // We iterate over each stamp, allocate the matrix and vectors if
     // necessary, and then calculate those matrix/vectors.
@@ -698 +693 @@
 XXX: Static structure for polyValues?
  ******************************************************************************/
-statis psF32 *ConvolvePixelPois(const psImage *input,
-                                const psImage *mask,
-                                psU32 badStampMaskVal,
-                                const psVector *solution,
-                                const psSubtractionKernels *kernels
-                                psS32 col,
-                                psS32 row)
+static psF32 ConvolvePixelPois(const psImage *input,
+                               const psImage *mask,
+                               psU32 badStampMaskVal,
+                               const psVector *solution,
+                               const psSubtractionKernels *kernels,
+                               psS32 col,
+                               psS32 row)
 {
     psS32 nBF = kernels->u->n;
@@ -711 +706 @@
     psF32 background = solution->data.F64[solution->n-1];
     psS32 spatialOrder = kernels->p_spatialOrder;
+    psF32 conv = background; // Initial convolved value
 
     if ((mask == NULL) || !(mask->data.U8[row][col] & badStampMaskVal)) {
-        psF32 conv = background; // Initial convolved value
         psF32 imageX = (((psF32) col) - numColsHalf) / numColsHalf; // Normalised position
         psF32 imageY = (((psF32) row) - numRowsHalf) / numRowsHalf; // Normalised position
@@ -744 +739 @@
             }
         }
-    }
-    psFree(polyValues);
+        psFree(polyValues);
+    }
 
     return(conv);
@@ -763 +758 @@
 XXX: Static structure for polyValues?
  ******************************************************************************/
-statis psF32 *ConvolvePixelIsis(const psImage *input,
-                                const psImage *mask,
-                                psU32 badStampMaskVal,
-                                const psVector *solution,
-                                const psSubtractionKernels *kernels
-                                psS32 col,
-                                psS32 row)
+static psF32 ConvolvePixelIsis(const psImage *input,
+                               const psImage *mask,
+                               psU32 badStampMaskVal,
+                               const psVector *solution,
+                               const psSubtractionKernels *kernels,
+                               psS32 col,
+                               psS32 row)
 {
     psS32 nBF = kernels->u->n;
@@ -776 +771 @@
     psF32 background = solution->data.F64[solution->n-1];
     psS32 spatialOrder = kernels->p_spatialOrder;
+    psS32 kernelSize = kernels->p_size;
+    psF32 conv = background; // Initial convolved value
 
     if ((mask == NULL) || !(mask->data.U8[row][col] & badStampMaskVal)) {
-        psF32 conv = background; // Initial convolved value
         psF32 imageX = (((psF32) col) - numColsHalf) / numColsHalf; // Normalised position
         psF32 imageY = (((psF32) row) - numRowsHalf) / numRowsHalf; // Normalised position
@@ -805 +801 @@
 
                     conv += solution->data.F64[k] *
-                            input->data.F32[yy+y][xx+x] *
+                            input->data.F32[yy+row][xx+col] *
                             preCalc->data.F32[yy-kernelSize][xx-kernelSize] *
                             polyVal;
@@ -811 +807 @@
             }
         }
-    }
-    psFree(polyValues);
+        psFree(polyValues);
+    }
 
     return(conv);
 }
-
-
-
-
-
 
 /*******************************************************************************
@@ -1144 +1135 @@
         // the psImage polyValues will hold (x^i * y^j) for the stamp.
         //
-        psImage *polyValues = GenSpatialOrder(psS32 spatialOrder, x, y);
+        psImage *polyValues = GenSpatialOrder(spatialOrder, x, y);
 
         for (psS32 k = 0 ; k < nBF ; k++) {