Changeset 4098

Timestamp:

Jun 3, 2005, 11:44:01 AM (21 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psModules

Files:

• src/pmImageSubtract.c (modified) (4 diffs)
• test/Makefile.am (modified) (2 diffs)

trunk/psModules/src/pmImageSubtract.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-31 21:25:09 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-03 21:43:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -282 +282 @@
 
                                         // Compute the value of the kernel at location (u, v):
-                                        psF32 exponent = (PS_SQR(uScaled) * PS_SQR(vScaled)) /
+                                        psF32 exponent = (PS_SQR(uScaled) + PS_SQR(vScaled)) /
                                                          (2.0 * PS_SQR(sigmas->data.F32[sigPtr]));
                                         currPreCalc->data.F32[v+size][u+size] =
@@ -334 +334 @@
     PS_ASSERT_INT_POSITIVE(yNum, NULL);
     PS_ASSERT_INT_POSITIVE(border, NULL);
+    PS_ASSERT_INT_LARGER_THAN(image->numCols, xNum, NULL);
+    PS_ASSERT_INT_LARGER_THAN(image->numRows, yNum, NULL);
+    PS_ASSERT_INT_LARGER_THAN(image->numCols, (2 * border), NULL);
+    PS_ASSERT_INT_LARGER_THAN(image->numRows, (2 * border), NULL);
 
     if (stamps != NULL) {
@@ -375 +379 @@
                 //
                 // The following nested loop iterates over every pixel in the mask
-                // associated with this (i, j).  It ignores over pixels within a
+                // associated with this (i, j).  It ignores pixels within a
                 // border of pixels from the image edge.
                 //

trunk/psModules/test/Makefile.am

@@ -10 +10 @@
         tst_pmReadoutCombine \
         tst_pmSubtractSky \
+        tst_pmImageSubtract \
         tst_pmObjects01
 
@@ -28 +29 @@
 tst_pmReadoutCombine_SOURCES = tst_pmReadoutCombine.c
 tst_pmSubtractSky_SOURCES = tst_pmSubtractSky.c
+tst_pmImageSubtract_SOURCES = tst_pmImageSubtract.c
 tst_pmObjects01_SOURCES = tst_pmObjects01.c