Changeset 15516 for branches/eam_branch_20071023/psModules/src/imcombine/pmSubtractionKernels.c

Timestamp:

Nov 8, 2007, 12:59:04 PM (19 years ago)

Author:

eugene

Message:

accepting updates from HEAD

File:

• branches/eam_branch_20071023/psModules/src/imcombine/pmSubtractionKernels.c (modified) (4 diffs)

branches/eam_branch_20071023/psModules/src/imcombine/pmSubtractionKernels.c

@@ -4 +4 @@
 
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 #include <pslib.h>
 
@@ -488 +488 @@
     PS_ASSERT_INT_NONNEGATIVE(spatialOrder, NULL);
     PS_ASSERT_INT_NONNEGATIVE(inner, NULL);
-    PS_ASSERT_INT_LESS_THAN(inner, size, NULL);
+    PS_ASSERT_INT_LESS_THAN_OR_EQUAL(inner, size, NULL);
     PS_ASSERT_INT_NONNEGATIVE(ringsOrder, NULL);
 
@@ -572 +572 @@
                     for (int v = -size; v <= size; v++) {
                         int v2 = PS_SQR(v);   // Square of v
-                        float vPoly = power(v, vOrder); // Value of v^vOrder
+//                        float vPoly = power(v, vOrder); // Value of v^vOrder
+                        float vPoly = powf(v/(float)size, vOrder); // Value of v^vOrder
 
                         for (int u = -size; u <= size; u++) {
@@ -578 +579 @@
                             int distance2 = u2 + v2; // Distance from the centre
                             if (distance2 > lower2 && distance2 < upper2) {
-                                float uPoly = power(u, uOrder); // Value of u^uOrder
+//                                float uPoly = power(u, uOrder); // Value of u^uOrder
+                                float uPoly = powf(u/(float)size, uOrder); // Value of u^uOrder
 
                                 float polyVal = uPoly * vPoly; // Value of polynomial