Changeset 21291

Timestamp:

Feb 4, 2009, 12:09:30 PM (17 years ago)

Author:

Paul Price

Message:

I think this is a better expression for the size of the covariance
matrix --- it's symmetric, and I haven't encountered any SEGVs yet...

File:

• trunk/psLib/src/imageops/psImageCovariance.c (modified) (2 diffs)

trunk/psLib/src/imageops/psImageCovariance.c

@@ -46 +46 @@
     // covariance matrix and another kernel.  This means that the resultant covariance matrix has twice the
     // size of the kernel plus the size of the input covariance matrix.
-
-    // Covariance matrix for output
-    psKernel *out = psKernelAlloc(2 * kernel->xMin + covar->xMin, 2 * kernel->xMax + covar->xMax,
-                                  2 * kernel->yMin + covar->yMin, 2 * kernel->yMax + covar->yMax);
+    int xMin = kernel->xMin - kernel->xMax + covar->xMin, xMax = kernel->xMax - kernel->xMin + covar->xMax;
+    int yMin = kernel->yMin - kernel->yMax + covar->yMin, yMax = kernel->yMax - kernel->yMin + covar->yMax;
+    psKernel *out = psKernelAlloc(xMin, xMax, yMin, yMax); // Covariance matrix for output
 
     // Need to go:
@@ -66 +65 @@
 
     double total = 0.0;                 // Total covariance
-    for (int y = out->yMin; y <= out->yMax; y++) {
+    for (int y = yMin; y <= yMax; y++) {
         // Range for v
         int vMin = PS_MAX(kernel->yMin + covar->yMin, y + kernel->yMin);
         int vMax = PS_MIN(kernel->yMax + covar->yMax, y + kernel->yMax);
-        for (int x = out->xMin; x <= out->xMax; x++) {
+        for (int x = xMin; x <= xMax; x++) {
             // Range for u
             int uMin = PS_MAX(kernel->xMin + covar->xMin, x + kernel->xMin);