Changeset 14307 for trunk/psModules/src/imcombine/pmSubtractionKernels.c

Timestamp:

Jul 18, 2007, 4:00:30 PM (19 years ago)

Author:

Paul Price

Message:

Fixed problems with segfaults in kernel generation for GUNK.

File:

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

trunk/psModules/src/imcombine/pmSubtractionKernels.c

@@ -404 +404 @@
     }
 
-    int numInner = 2 * PS_SQR(inner) + 1; // Number of inner kernel elements
+    int numInner = PS_SQR(2 * PS_SQR(inner) + 1); // Number of inner kernel elements
     int numSpatial = (spatialOrder + 1) * (spatialOrder + 2) / 2; // Number of spatial variations of a kernel
 
@@ -411 +411 @@
     pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_GUNK,
                                                               size, spatialOrder); // The kernels
-    kernels->sigma = psVectorAlloc(num, PS_TYPE_F32);
+    kernels->sigma = psVectorAlloc(numGaussianVars * numSpatial, PS_TYPE_F32);
     kernels->preCalc = psArrayAlloc(numGaussianVars * numSpatial);
     kernels->inner = numGaussianVars * numSpatial;