Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtengine/klt/convolve.cc
+++ b/rtengine/klt/convolve.cc
@@ -87,9 +87,11 @@ static void _computeKernels(
    for (i = -hw ; fabs(gaussderiv->data[i+hw] / max_gaussderiv) < factor ; 
         i++, gaussderiv->width -= 2);
    if (gauss->width == MAX_KERNEL_WIDTH || 
-        gaussderiv->width == MAX_KERNEL_WIDTH)
+        gaussderiv->width == MAX_KERNEL_WIDTH) {
      KLTError("(_computeKernels) MAX_KERNEL_WIDTH %d is too small for "
               "a sigma of %f", MAX_KERNEL_WIDTH, sigma);
+      exit(1);
+    }
  }

  /* Shift if width less than MAX_KERNEL_WIDTH */