Changeset 26588

Timestamp:

Jan 13, 2010, 5:18:55 PM (16 years ago)

Author:

Paul Price

Message:

Wasn't renormalising if forceZeroNull was true and order was odd.

File:

• branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionKernels.c (modified) (3 diffs)

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

@@ -220 +220 @@
     }
     if (forceZeroNull) {
+        // Force rescaling and subtraction of null pixel even though the order doesn't indicate it's even
+        scale2D = 1.0 / fabs(sum);
         zeroNull = true;
     }
@@ -236 +238 @@
 
     psBinaryOp(preCalc->kernel->image, preCalc->kernel->image, "*", psScalarAlloc(scale2D, PS_TYPE_F32));
-    penalty *= PS_SQR(scale2D);
+    penalty *= 1.0 / sum2;
 
     if (zeroNull) {
@@ -242 +244 @@
     }
 
-#if 0
-    sum = 0.0;   // Sum of kernel component
-    min = FLT_MAX;
-    max = FLT_MIN;
-    for (int v = -size; v <= size; v++) {
-        for (int u = -size; u <= size; u++) {
-            sum += preCalc->kernel->kernel[v][u];
-            min = PS_MIN(preCalc->kernel->kernel[v][u], min);
-            max = PS_MAX(preCalc->kernel->kernel[v][u], max);
-        }
-    }
-    fprintf(stderr, "%d mod: %lf, null: %f, min: %lf, max: %lf, scale: %f\n", index, sum, preCalc->kernel->kernel[0][0], min, max, scale2D);
+#if 1
+    {
+        double sum = 0.0;   // Sum of kernel component
+        float min = INFINITY, max = -INFINITY;  // Minimum and maximum kernel value
+        for (int v = -size; v <= size; v++) {
+            for (int u = -size; u <= size; u++) {
+                sum += preCalc->kernel->kernel[v][u];
+                min = PS_MIN(preCalc->kernel->kernel[v][u], min);
+                max = PS_MAX(preCalc->kernel->kernel[v][u], max);
+            }
+        }
+        fprintf(stderr, "%d mod: %lf, null: %f, min: %lf, max: %lf, scale: %f\n", index, sum, preCalc->kernel->kernel[0][0], min, max, scale2D);
+    }
 #endif