Changeset 32727 for trunk/psLib

Timestamp:

Nov 21, 2011, 5:39:43 AM (15 years ago)

Author:

eugene

Message:

fix rare endpost error in psImageConvolve

File:

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

trunk/psLib/src/imageops/psImageConvolve.c

@@ -624 +624 @@
                 ps##TYPE *vo = calculation->data.TYPE; \
                 int xMax = PS_MIN(Nrange, Nx); \
-                int convRange = PS_MIN(Nrange + 1, Nx); \
                 /* Smooth first Nrange pixels, with renorm */ \
                 for (int i = 0; i < xMax; i++, vi++, vo++) { \
+                    int convRange = PS_MIN(Nrange + 1, Nx - xMax + 1);  \
                     ps##TYPE *vr = vi - i; \
                     ps##TYPE *vg = gauss - i; \
@@ -672 +672 @@
         /* Smooth the first Nrange pixels, with renorm */ \
         int yMax = PS_MIN(Nrange, Ny); \
-        int convRange = PS_MIN(Nrange + 1, Ny); \
         for (int j = 0; j < yMax; j++) { \
+            int convRange = PS_MIN(Nrange + 1, Ny - j);                \
             psVector *calculation = psVectorAlloc(Nx, PS_TYPE_##TYPE); \
             /* Zero the output row */ \
@@ -825 +825 @@
         for (int j = 0; j < Ny; j++) {
             psF32 *vi = image->data.F32[j];
-            int xMax = PS_MIN(Nrange, Nx);
-            int convRange = PS_MIN(Nrange + 1, Nx);
+            int xMax = PS_MIN(Nrange + 1, Nx);
             /* Smooth first Nrange pixels, with renorm */
             for (int i = 0; i < xMax; i++, vi++) {
+                int convRange = PS_MIN(Nrange + 1, Nx - i);
                 psF32 *vr = vi - i;
                 psF32 *vg = gauss - i;
@@ -873 +873 @@
         for (int i = 0; i < Nx; i++) {
             int yMax = PS_MIN(Nrange, Ny);
-            int convRange = PS_MIN(Nrange + 1, Ny);
             /* Smooth first Nrange pixels, with renorm */
             for (int j = 0; j < yMax; j++) {
+                int convRange = PS_MIN(Nrange + 1, Ny - j);
                 psF32 *vg = gauss - j;
                 double g = 0.0;