Changeset 34772 for branches/czw_branch/20120906/psLib/src/imageops/psImageConvolve.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

File:

• branches/czw_branch/20120906/psLib/src/imageops/psImageConvolve.c (modified) (1 diff)

branches/czw_branch/20120906/psLib/src/imageops/psImageConvolve.c

@@ -605 +605 @@
     PS_ASSERT_IMAGE_NON_NULL(image, false);
 
+    if (sigma < 0.25) {
+        psTrace("psLib.imageops", 5, "sigma: %f < 0.25 skipping smoothing", sigma);
+        return true;
+    }
+
     // relevant terms
     int Nrange = sigma*Nsigma + 0.5;    // Number of pixels either side for convolution kernel
+    if (Nrange < 1) {
+        // using zero will cause an arithmetic exception in the loop
+        psTrace("psLib.imageops", 5, "Nrange %d for smoothing too small skipping smoothing", Nrange);
+        return true;
+    }
     int Nx = image->numCols;            // Number of columns
     int Ny = image->numRows;            // Number of rows