Changeset 32729 for trunk/psLib

Timestamp:

Nov 21, 2011, 10:51:45 AM (15 years ago)

Author:

eugene

Message:

(another) counting error in psImageSmooth_PreAlloc

File:

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

trunk/psLib/src/imageops/psImageConvolve.c

@@ -834 +834 @@
                 double s = 0.0;
                 for (int n = -i; n < convRange; n++, vr++, vg++) {
+                    psAssert (vr - image->data.F32[j] < image->numCols, "counting error");
                     s += *vg * *vr;
                     g += *vg;
@@ -841 +842 @@
             /* If that's all the pixels we have, then we're done already */
             if (Nx > Nrange) {
-                /* Smooth middle pixels */
+                /* Smooth middle pixels; if Nx < 2*Nrange, this pass is skipped */
                 for (int i = Nrange; i < Nx - Nrange; i++, vi++) {
                     psF32 *vr = vi - Nrange;
@@ -847 +848 @@
                     double s = 0;
                     for (int n = -Nrange; n < Nrange + 1; n++, vr++, vg++) {
+                        psAssert (vr - image->data.F32[j] < image->numCols, "counting error");
                         s += *vg * *vr;
                     }
@@ -852 +854 @@
                 }
                 /* Smooth last Nrange pixels, with renorm */
-                for (int i = Nx - Nrange; i < Nx; i++, vi++) {
+                // if Nx < 2*Nrange, this pass starts at i == Nrange
+                int xMin = PS_MAX(Nx - Nrange, Nrange);
+                for (int i = xMin; i < Nx; i++, vi++) {
                     psF32 *vr = vi - Nrange;
                     psF32 *vg = gauss - Nrange;
@@ -858 +862 @@
                     double s = 0.0;
                     for (int n = -Nrange; n < Nx - i; n++, vr++, vg++) {
+                        psAssert (vr - image->data.F32[j] < image->numCols, "counting error");
                         s += *vg * *vr;
                         g += *vg;