Changeset 26237 for branches/eam_branches/20091113/psModules/src/imcombine

Timestamp:

Nov 20, 2009, 4:15:17 PM (17 years ago)

Author:

eugene

Message:

updates from head

Location:

branches/eam_branches/20091113

Files:

• . (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionKernels.c (modified) (1 diff)
• psModules/src/imcombine/pmSubtractionKernels.h (modified) (1 diff)

branches/eam_branches/20091113/psModules/src/imcombine/pmSubtractionKernels.c

@@ -250 +250 @@
     int num = PS_SQR(2 * size + 1) - 1; // Number of basis functions
 
-    pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_POIS, size,
+    pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(0, PM_SUBTRACTION_KERNEL_POIS, size,
                                                               spatialOrder, penalty, mode); // The kernels
     psStringAppend(&kernels->description, "POIS(%d,%d,%.2e)", size, spatialOrder, penalty);

branches/eam_branches/20091113/psModules/src/imcombine/pmSubtractionKernels.h

@@ -52 +52 @@
     PS_ASSERT_PTR_NON_NULL(KERNELS, RETURNVALUE); \
     PS_ASSERT_STRING_NON_EMPTY((KERNELS)->description, RETURNVALUE); \
-    PS_ASSERT_INT_POSITIVE((KERNELS)->num, RETURNVALUE); \
+    PS_ASSERT_INT_NONNEGATIVE((KERNELS)->num, RETURNVALUE); \
     PS_ASSERT_VECTOR_NON_NULL((KERNELS)->u, RETURNVALUE); \
     PS_ASSERT_VECTOR_NON_NULL((KERNELS)->v, RETURNVALUE); \