Changeset 8872

Timestamp:

08/08/12 10:57:02 (9 months ago)

Author:

nicolas

Message:

remove all colormap OpenMP for loops

File:

• ImageMagick/trunk/MagickCore/enhance.c (modified) (15 diffs)

ImageMagick/trunk/MagickCore/enhance.c

@@ -723 +723 @@
   }
   if (image->storage_class == PseudoClass)
-    {
-      /*
-        Apply transfer function to colormap.
-      */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) shared(progress,status) \
-        dynamic_number_threads(image,image->columns,1,1)
-#endif
-      for (i=0; i < (ssize_t) image->colors; i++)
-      {
+    for (i=0; i < (ssize_t) image->colors; i++)
+      {
+        /*
+          Apply transfer function to colormap.
+        */
         double
           luma;
@@ -748 +743 @@
           luma;
       }
-    }
   /*
     Apply transfer function to image.
@@ -1176 +1170 @@
         Stretch-contrast colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) shared(progress,status) \
-        dynamic_number_threads(image,image->columns,1,1)
-#endif
       for (j=0; j < (ssize_t) image->colors; j++)
       {
@@ -1655 +1645 @@
         Equalize colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) shared(progress,status) \
-        dynamic_number_threads(image,image->columns,1,1)
-#endif
       for (j=0; j < (ssize_t) image->colors; j++)
       {
@@ -1847 +1833 @@
         MaxMap,1.0/gamma)));
   if (image->storage_class == PseudoClass)
-    {
-      /*
-        Gamma-correct colormap.
-      */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static) shared(progress,status) \
-        dynamic_number_threads(image,image->columns,1,1)
-#endif
-      for (i=0; i < (ssize_t) image->colors; i++)
-      {
+    for (i=0; i < (ssize_t) image->colors; i++)
+      {
+        /*
+          Gamma-correct colormap.
+        */
         if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
           image->colormap[i].red=(double) gamma_map[
@@ -1870 +1851 @@
             ScaleQuantumToMap(ClampToQuantum(image->colormap[i].alpha))];
       }
-    }
   /*
     Gamma-correct image.
@@ -2228 +2208 @@
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->storage_class == PseudoClass)
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-    #pragma omp parallel for schedule(static,4) shared(progress,status) \
-      dynamic_number_threads(image,image->columns,1,1)
-#endif
     for (i=0; i < (ssize_t) image->colors; i++)
     {
@@ -2397 +2373 @@
     (void) SetImageColorspace(image,RGBColorspace,exception);
   if (image->storage_class == PseudoClass)
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-    #pragma omp parallel for schedule(static,4) shared(progress,status) \
-      dynamic_number_threads(image,image->columns,1,1)
-#endif
     for (i=0; i < (ssize_t) image->colors; i++)
     {
@@ -2908 +2880 @@
       MagickFalse,artifact);
   if (image->storage_class == PseudoClass)
-    {
-      /*
-        Modulate colormap.
-      */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) shared(progress,status) \
-        dynamic_number_threads(image,image->columns,1,1)
-#endif
-      for (i=0; i < (ssize_t) image->colors; i++)
+    for (i=0; i < (ssize_t) image->colors; i++)
       {
         double
@@ -2923 +2887 @@
           red;
 
+        /*
+          Modulate colormap.
+        */
         red=image->colormap[i].red;
         green=image->colormap[i].green;
@@ -2949 +2916 @@
         }
       }
-    }
   /*
     Modulate image.
@@ -3085 +3051 @@
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->storage_class == PseudoClass)
-    {
-      /*
-        Negate colormap.
-      */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static) shared(progress,status) \
-        dynamic_number_threads(image,image->columns,1,1)
-#endif
-      for (i=0; i < (ssize_t) image->colors; i++)
-      {
+    for (i=0; i < (ssize_t) image->colors; i++)
+      {
+        /*
+          Negate colormap.
+        */
         if (grayscale != MagickFalse)
           if ((image->colormap[i].red != image->colormap[i].green) ||
@@ -3109 +3070 @@
             image->colormap[i].blue;
       }
-    }
   /*
     Negate image.
@@ -3409 +3369 @@
         (double) i/MaxMap)));
   if (image->storage_class == PseudoClass)
-    {
-      /*
-        Sigmoidal-contrast enhance colormap.
-      */
-      for (i=0; i < (ssize_t) image->colors; i++)
-      {
+    for (i=0; i < (ssize_t) image->colors; i++)
+      {
+        /*
+          Sigmoidal-contrast enhance colormap.
+        */
         if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
           image->colormap[i].red=ClampToQuantum(sigmoidal_map[
@@ -3428 +3387 @@
             ScaleQuantumToMap(image->colormap[i].alpha)]);
       }
-    }
   /*
     Sigmoidal-contrast enhance image.