Changeset 7077

Timestamp:

May 5, 2006, 1:55:56 PM (20 years ago)

Author:

Paul Price

Message:

SEGVs from overrunning the bounds with narrow images averted.

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (7 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-05 22:32:35 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-05 23:55:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -588 +588 @@
 
     // relevant terms
-    int Nrange = sigma*Nsigma + 0.5;
-    int Npixel = 2*Nrange + 1;
-    double factor = -0.5/(sigma*sigma);
-
-    int Nx = image->numCols;
-    int Ny = image->numRows;
+    int Nrange = sigma*Nsigma + 0.5;    // Number of pixels either side
+    int Npixel = 2*Nrange + 1;          // Total number of pixels in convolution kernel
+    int Nx = image->numCols;            // Number of columns
+    int Ny = image->numRows;            // Number of rows
 
     #define IMAGESMOOTH_CASE(TYPE) \
@@ -601 +599 @@
         gaussnorm->n = gaussnorm->nalloc; \
         double sum = 0.0; \
+        double factor = -0.5/(sigma*sigma); \
         for (int i = -Nrange; i < Nrange + 1; i++) { \
             gaussnorm->data.TYPE[i+Nrange] = exp (factor*i*i); \
@@ -617 +616 @@
             ps##TYPE *vo = temp->data.TYPE; \
             /* smooth first Nrange pixels, with renorm */ \
-            /* XXX need to check that this does not run over end for narrow images */ \
-            for (int i = 0; i < Nrange; i++, vi++, vo++) { \
+            int xMax = PS_MIN(Nrange, Nx); \
+            for (int i = 0; i < xMax; i++, vi++, vo++) { \
                 ps##TYPE *vr = vi - i; \
                 ps##TYPE *vg = gauss - i; \
@@ -641 +640 @@
             /* smooth last Nrange pixels, with renorm */ \
             /* XXX does this miss the last column? */ \
-            for (int i = Nx - Nrange; i < Nx; i++, vi++, vo++) { \
+            for (int i = PS_MAX(Nx - Nrange, 0); i < Nx; i++, vi++, vo++) { \
                 ps##TYPE *vr = vi - Nrange; \
                 ps##TYPE *vg = gauss - Nrange; \
@@ -659 +658 @@
         psArray *temprows = psArrayAlloc (Nrange); \
         temprows->n = Nrange; \
-        for (int j = 0; j < Nrange; j++) { \
+        int yMax = PS_MIN(Nrange, Ny); \
+        for (int j = 0; j < yMax; j++) { \
             temp = psVectorAlloc (Nx, PS_TYPE_##TYPE); \
             temp->n = temp->nalloc; \
@@ -691 +691 @@
             } \
         } \
-        for (int j = Ny - Nrange; j < Ny; j++) { \
+        for (int j = PS_MAX(Ny - Nrange, 0); j < Ny; j++) { \
             /* save the Nrange-offset output row, then zero */ \
             int Nr = j % Nrange; \