(no commit message)

[imagemagick] / MagickCore / feature.c

diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 150214911f3769e0a4cb6918140124f900dd49c9..bba5438204b5d319f06fde19373f569915f7495f 100644 (file)
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -181,8 +181,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
     length;
 
   ssize_t
-    y,
-    z;
+    y;
 
   unsigned int
     number_grays;
@@ -223,7 +222,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
   status=MagickTrue;
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(status)
+  #pragma omp parallel for schedule(static,4) shared(status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
@@ -593,7 +592,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
     Compute texture features.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(status)
+  #pragma omp parallel for schedule(static,4) shared(status)
 #endif
   for (i=0; i < 4; i++)
   {
@@ -777,7 +776,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
     Compute more texture features.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(status)
+  #pragma omp parallel for schedule(static,4) shared(status)
 #endif
   for (i=0; i < 4; i++)
   {
@@ -852,7 +851,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
     Compute more texture features.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(status)
+  #pragma omp parallel for schedule(static,4) shared(status)
 #endif
   for (i=0; i < 4; i++)
   {
@@ -972,7 +971,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
   (void) ResetMagickMemory(&variance,0,sizeof(variance));
   (void) ResetMagickMemory(&sum_squares,0,sizeof(sum_squares));
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(status)
+  #pragma omp parallel for schedule(static,4) shared(status)
 #endif
   for (i=0; i < 4; i++)
   {
@@ -1123,10 +1122,13 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image,
     Compute more texture features.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(status)
+  #pragma omp parallel for schedule(static,4) shared(status)
 #endif
   for (i=0; i < 4; i++)
   {
+    ssize_t
+      z;
+
     for (z=0; z < (ssize_t) number_grays; z++)
     {
       register ssize_t