Changeset 14125

Timestamp:

Jul 10, 2007, 3:28:39 PM (19 years ago)

Author:

Paul Price

Message:

Shouldn't use 'x' and 'y' in the macro, since these are defined outside, and it clobbers them.

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-07-10 23:54:26 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-07-11 01:28:39 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -285 +285 @@
           break; \
       } \
-            case PM_SUBTRACTION_KERNEL_ISIS: { \
+      case PM_SUBTRACTION_KERNEL_ISIS: { \
           psKernel *kernel = (KERNELS)->preCalc->data[(INDEX)]; /* The convolution kernel */ \
           psKernel *subKernel = (KERNELS)->preCalc->data[(KERNELS)->subIndex]; /* Kernel to subtract */ \
@@ -291 +291 @@
           double sum = 0.0;             /* Accumulated sum from convolution */ \
           double sub = 0.0;             /* Accumulated sum to subtract */ \
-          for (int v = -size, y = (Y) - size; v <= size; v++, y++) { \
-              for (int u = -size, x = (X) - size; u <= size; u++, x++) { \
-                  sum += FUNC(kernel->kernel[v][u]) * (IMAGE)->data.F32[y][x]; \
+          for (int v = -size, yLocation = (Y) - size; v <= size; v++, yLocation++) { \
+              for (int u = -size, xLocation = (X) - size; u <= size; u++, xLocation++) { \
+                  sum += FUNC(kernel->kernel[v][u]) * (IMAGE)->data.F32[yLocation][xLocation]; \
                   /* The (0,0) kernel is subtracted from other kernels to preserve photometric scaling */ \
                   if ((KERNELS)->spatialOrder > 0 && (INDEX) != (KERNELS)->subIndex) { \
-                      sub += FUNC(subKernel->kernel[v][u]) * (IMAGE)->data.F32[y][x]; \
+                      sub += FUNC(subKernel->kernel[v][u]) * (IMAGE)->data.F32[yLocation][xLocation]; \
                   } \
               } \