Changeset 30341

Timestamp:

Jan 22, 2011, 11:55:36 AM (15 years ago)

Author:

eugene

Message:

psKernelTruncate was failing drastically (zeroing the kernel) if the maxSize was reached

File:

• branches/eam_branches/ipp-20101205/psLib/src/imageops/psImageConvolve.c (modified) (2 diffs)

branches/eam_branches/ipp-20101205/psLib/src/imageops/psImageConvolve.c

@@ -275 +275 @@
     float threshold = sumKernel * (1.0 - frac); // Threshold for truncation
 
+    int truncateRadius = maxSize;       // Truncation radius
+    bool truncate = false;
+
     // Find truncation size
-    int truncate = 0;                     // Truncation radius
-    for (int radius = 1; truncate == 0 && radius < maxSize; radius++) {
+    for (int radius = 1; !truncate && (radius < maxSize); radius++) {
         int uMin = PS_MAX(-radius, xMin);
         int uMax = PS_MIN(radius, xMax);
@@ -293 +295 @@
             }
         }
+        // This is the truncation radius
         if (sum > threshold) {
-            // This is the truncation radius
-            truncate = radius;
-        }
-    }
-    if (truncate == maxSize) {
-        // No truncation possible
+            truncate = true;
+            truncateRadius = radius;
+        }
+    }
+
+    // Do nothing if no truncation is possible
+    if (!truncate) {
         return true;
     }