Changeset 26539

Timestamp:

Jan 7, 2010, 3:06:45 PM (16 years ago)

Author:

Paul Price

Message:

Fix range of kernels output.

File:

• branches/eam_branches/20091201/psModules/src/imcombine/pmSubtraction.c (modified) (4 diffs)

branches/eam_branches/20091201/psModules/src/imcombine/pmSubtraction.c

@@ -170 +170 @@
           }
           case PM_SUBTRACTION_KERNEL_RINGS: {
-              pmSubtractionKernelPreCalc *preCalc = kernels->preCalc->data[i]; // Precalculated kernels
+              pmSubtractionKernelPreCalc *preCalc = kernels->preCalc->data[i]; // Precalculated kernels
               int num = preCalc->uCoords->n;     // Number of pixels
 
               for (int j = 0; j < num; j++) {
                   int u = preCalc->uCoords->data.S32[j];
-                  int v = preCalc->vCoords->data.S32[j]; // Kernel coordinates
+                  int v = preCalc->vCoords->data.S32[j]; // Kernel coordinates
                   kernel->kernel[v][u] += preCalc->poly->data.F32[j] * value;
               }
@@ -693 +693 @@
           int num = preCalc->uCoords->n;         // Number of pixels
           psS32 *uData = preCalc->uCoords->data.S32; // Dereference v coordinate
-          psS32 *vData = preCalc->vCoords->data.S32; // Dereference u coordinate
+          psS32 *vData = preCalc->vCoords->data.S32; // Dereference u coordinate
           psF32 *polyData = preCalc->poly->data.F32; // Dereference polynomial values
           psF32 **imageData = image->kernel;  // Dereference image
@@ -772 +772 @@
     return true;
 }
-
-
 
 
@@ -1004 +1002 @@
     psVector *backup = psVectorCopy(NULL, solution, PS_TYPE_F64);  // Backup version
 
-    int num = wantDual ? solution->n - 1 : solution->n; // Number of kernel basis functions
+    int num = kernels->num;             // Number of kernel basis functions
 
     psImage *polyValues = p_pmSubtractionPolynomial(NULL, kernels->spatialOrder, x, y); // Solved polynomial