From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 5 Jan 2012 16:20:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6453
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd0435bb0fa5e2e20ec8d3c5288a5edc44aba9a0;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index fe988d3a5..ea9a82dd0 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -636,7 +636,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       image_view=AcquireCacheView(image);
       composite_view=AcquireCacheView(composite_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-#pragma omp parallel for schedule(static,4) shared(status)
+      #pragma omp parallel for schedule(static,4) shared(status)
 #endif
       for (y=0; y < (ssize_t) composite_image->rows; y++)
       {
@@ -697,7 +697,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
               proceed;
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-#pragma omp critical (MagickCore_CompositeImage)
+            #pragma omp critical (MagickCore_CompositeImage)
 #endif
             proceed=SetImageProgress(image,CompositeImageTag,
               (MagickOffsetType) y,image->rows);
@@ -1140,7 +1140,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   image_view=AcquireCacheView(image);
   composite_view=AcquireCacheView(composite_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-//  #pragma omp parallel for schedule(static,4) shared(progress,status)
+  #pragma omp parallel for schedule(static,4) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
@@ -2207,7 +2207,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           proceed;
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp critical (MagickCore_CompositeImage)
+        #pragma omp critical (MagickCore_CompositeImage)
 #endif
         proceed=SetImageProgress(image,CompositeImageTag,progress++,
           image->rows);
@@ -2310,7 +2310,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,
               proceed;
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp critical (MagickCore_TextureImage)
+           #pragma omp critical (MagickCore_TextureImage)
 #endif
             proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType)
               y,image->rows);