Changeset 25027 for branches/pap/psModules/src/imcombine/pmSubtractionKernels.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionKernels.c (modified) (2 diffs)

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

@@ -145 +145 @@
 
                 // Calculate moments
-                double sum = 0.0;       // Sum of kernel component, for normalisation
                 double moment = 0.0;    // Moment, for penalty
                 for (int v = -size, y = 0; v <= size; v++, y++) {
                     for (int u = -size, x = 0; u <= size; u++, x++) {
                         double value = xKernel->data.F32[x] * yKernel->data.F32[y]; // Value of kernel
-                        sum += value;
                         moment += value * (PS_SQR(u) + PS_SQR(v));
                     }
@@ -163 +161 @@
                         }
                     }
-                    sum = 1.0 / sum;
+                    sum = 1.0 / sqrt(sum);
                     psBinaryOp(xKernel, xKernel, "*", psScalarAlloc(sum, PS_TYPE_F32));
                     psBinaryOp(yKernel, yKernel, "*", psScalarAlloc(sum, PS_TYPE_F32));
-                    moment *= sum;
+                    moment *= PS_SQR(sum);
                 }