(no commit message)

[imagemagick] / filters / analyze.c

diff --git a/filters/analyze.c b/filters/analyze.c
index 9622757e2825a02ebd6a7d6fadb0a84501801c7c..7dd95f3dfa817f7909747947d7b1c8a7fa619e62 100644 (file)
--- a/filters/analyze.c
+++ b/filters/analyze.c
@@ -15,7 +15,7 @@
 %                              December 1998                                  %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -81,7 +81,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
   const char **argv,ExceptionInfo *exception)
 {
   char
-    text[MaxTextExtent];
+    text[MagickPathExtent];
 
   double
     area,
@@ -146,7 +146,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
     image_view=AcquireVirtualCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp parallel for schedule(static,4) shared(status) \
-      dynamic_num_threads_dos(image->columns,image->rows)
+      magick_threads(image,image,image->rows,1)
 #endif
     for (y=0; y < (ssize_t) image->rows; y++)
     {
@@ -186,12 +186,12 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
     if (area <= 0.0)
       break;
     brightness_mean=brightness_sum_x/area;
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_mean);
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_mean);
     (void) SetImageProperty(image,"filter:brightness:mean",text,
       exception);
     brightness_standard_deviation=sqrt(brightness_sum_x2/area-(brightness_sum_x/
       area*brightness_sum_x/area));
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",
       brightness_standard_deviation);
     (void) SetImageProperty(image,"filter:brightness:standard-deviation",text,
       exception);
@@ -202,7 +202,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
         brightness_mean*brightness_mean)/(brightness_standard_deviation*
         brightness_standard_deviation*brightness_standard_deviation*
         brightness_standard_deviation)-3.0;
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_kurtosis);
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_kurtosis);
     (void) SetImageProperty(image,"filter:brightness:kurtosis",text,
       exception);
     if (brightness_standard_deviation != 0)
@@ -210,16 +210,16 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
         brightness_sum_x2/area+2.0*brightness_mean*brightness_mean*
         brightness_mean)/(brightness_standard_deviation*
         brightness_standard_deviation*brightness_standard_deviation);
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",brightness_skewness);
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",brightness_skewness);
     (void) SetImageProperty(image,"filter:brightness:skewness",text,
       exception);
     saturation_mean=saturation_sum_x/area;
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_mean);
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_mean);
     (void) SetImageProperty(image,"filter:saturation:mean",text,
       exception);
     saturation_standard_deviation=sqrt(saturation_sum_x2/area-(saturation_sum_x/
       area*saturation_sum_x/area));
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",
       saturation_standard_deviation);
     (void) SetImageProperty(image,"filter:saturation:standard-deviation",text,
       exception);
@@ -230,7 +230,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
         saturation_mean*saturation_mean)/(saturation_standard_deviation*
         saturation_standard_deviation*saturation_standard_deviation*
         saturation_standard_deviation)-3.0;
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_kurtosis);
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_kurtosis);
     (void) SetImageProperty(image,"filter:saturation:kurtosis",text,
       exception);
     if (fabs(saturation_standard_deviation) >= MagickEpsilon)
@@ -238,7 +238,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc,
         saturation_sum_x2/area+2.0*saturation_mean*saturation_mean*
         saturation_mean)/(saturation_standard_deviation*
         saturation_standard_deviation*saturation_standard_deviation);
-    (void) FormatLocaleString(text,MaxTextExtent,"%g",saturation_skewness);
+    (void) FormatLocaleString(text,MagickPathExtent,"%g",saturation_skewness);
     (void) SetImageProperty(image,"filter:saturation:skewness",text,
       exception);
   }