Changeset 10877 for ImageMagick/trunk

Timestamp:

05/11/08 08:07:40 (4 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/color.c (modified) (4 diffs)
• magick/enhance.c (modified) (3 diffs)
• magick/fx.c (modified) (2 diffs)
• magick/pixel-private.h (modified) (2 diffs)

ImageMagick/trunk/ChangeLog

@@ +1 @@
+2008-05-09  6.4.1-2 Leonardo de Paula Rosa Piga <lpiga@terra...>
+  * OpenMP patch for sepia-tone effect.
+
 2008-05-08  6.4.1-2 Bruno Cardoso Lopes <bruno.cardoso@gmail...>
   * OpenMP patch for NormalizeImage() & TintImage()

ImageMagick/trunk/magick/color.c

@@ -1805 +1805 @@
         for (x=0; x < (long) image->columns; x++)
         {
-          if ((p->red != p->green) || (p->green != p->blue))
+          if (IsGrayPixel(p) == MagickFalse)
             break;
           p++;
@@ -1820 +1820 @@
       for (i=0; i < (long) image->colors; i++)
       {
-        if ((p->red != p->green) || (p->green != p->blue))
+        if (IsGrayPixel(p) == MagickFalse)
           break;
         p++;
@@ -2275 +2275 @@
         for (x=0; x < (long) image->columns; x++)
         {
-          if ((p->red != p->green) || (p->green != p->blue))
-            break;
-          if ((p->red != 0) && (p->red != (Quantum) QuantumRange))
+          if (IsMonochromePixel(p) == MagickFalse)
             break;
           p++;
@@ -2292 +2290 @@
       for (i=0; i < (long) image->colors; i++)
       {
-        if ((p->red != p->green) || (p->green != p->blue))
-          break;
-        if ((p->red != 0) && (p->red != (Quantum) QuantumRange))
+        if (IsMonochromePixel(p) == MagickFalse)
           break;
         p++;

ImageMagick/trunk/magick/enhance.c

@@ -298 +298 @@
 
   MagickBooleanType
-    status;
+    status,
+    sync_image_retval = MagickTrue;
+
+  ViewInfo *image_view;
 
   register long
@@ -306 +309 @@
   register PixelPacket
     *q;
+
 
   assert(image != (Image *) NULL);
@@ -324 +328 @@
     Contrast enhance image.
   */
-  for (y=0; y < (long) image->rows; y++)
+  image_view=OpenCacheView(image);
+
+  #pragma omp parallel private(y, x, q) firstprivate(sync_image_retval, image_view)
   {
-    q=GetImagePixels(image,0,y,image->columns,1);
-    if (q == (PixelPacket *) NULL)
-      break;
-    for (x=0; x < (long) image->columns; x++)
-    {
-      Contrast(sign,&q->red,&q->green,&q->blue);
-      q++;
-    }
-    if (SyncImagePixels(image) == MagickFalse)
-      break;
-    if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
-        (QuantumTick(y,image->rows) != MagickFalse))
-      {
-        status=image->progress_monitor(sharpen != MagickFalse ?
-          SharpenContrastImageTag : DullContrastImageTag,y,image->rows,
-          image->client_data);
-        if (status == MagickFalse)
-          break;
-      }
+    #pragma omp for ordered
+    for (y=0; y < (long) image->rows; y++)
+    {
+      #pragma omp critical
+      q=GetCacheViewPixels(image_view,0,y,image->columns,1);
+      if (q == (PixelPacket *) NULL)
+        continue;
+      for (x=0; x < (long) image->columns; x++)
+      {
+        Contrast(sign,&q->red,&q->green,&q->blue);
+        q++;
+      }
+      #pragma omp critical
+      {
+        sync_image_retval = SyncCacheView(image_view);
+      } /* end omp critical*/
+      if (sync_image_retval == MagickFalse)
+        continue;
+      if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+          (QuantumTick(y,image->rows) != MagickFalse))
+        {
+          status=image->progress_monitor(sharpen != MagickFalse ?
+            SharpenContrastImageTag : DullContrastImageTag,y,image->rows,
+            image->client_data);
+          if (status == MagickFalse)
+            continue;
+        }
+    }
   }
   return(MagickTrue);

ImageMagick/trunk/magick/fx.c

@@ -3220 +3220 @@
     *q;
 
+  ViewInfo
+    *image_view,
+    *sepia_view;
+
   /*
     Initialize sepia-toned image attributes.
@@ -3241 +3245 @@
     Tone each row of the image.
   */
-  for (y=0; y < (long) image->rows; y++)
+  #pragma omp parallel private(image_view, intensity, p, q, sepia_view, tone, x, y)
   {
-    p=AcquireImagePixels(image,0,y,image->columns,1,exception);
-    q=SetImagePixels(sepia_image,0,y,sepia_image->columns,1);
-    if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
-      break;
-    for (x=0; x < (long) image->columns; x++)
-    {
-      intensity=(MagickRealType) PixelIntensityToQuantum(p);
-      tone=intensity > threshold ? (MagickRealType) QuantumRange :
-        intensity+(MagickRealType) QuantumRange-threshold;
-      q->red=RoundToQuantum(tone);
-      tone=intensity > (7.0*threshold/6.0) ? (MagickRealType) QuantumRange :
-        intensity+(MagickRealType) QuantumRange-7.0*threshold/6.0;
-      q->green=RoundToQuantum(tone);
-      tone=intensity < (threshold/6.0) ? 0 : intensity-threshold/6.0;
-      q->blue=RoundToQuantum(tone);
-      tone=threshold/7.0;
-      if ((MagickRealType) q->green < tone)
-        q->green=RoundToQuantum(tone);
-      if ((MagickRealType) q->blue < tone)
-        q->blue=RoundToQuantum(tone);
-      p++;
-      q++;
-    }
-    if (SyncImagePixels(sepia_image) == MagickFalse)
-      break;
-    if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
-        (QuantumTick(y,image->rows) != MagickFalse))
+    image_view=OpenCacheView(image);
+    sepia_view=OpenCacheView(sepia_image);
+    #pragma omp for
+    for (y=0; y < (long) image->rows; y++)
+    {
+      p=AcquireCacheViewPixels(image_view,0,y,image->columns,1,exception);
+      q=SetCacheView(sepia_view,0,y,sepia_image->columns,1);
+      if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+        continue;
+      #pragma omp for
+      for (x=0; x < (long) image->columns; x++)
       {
-        status=image->progress_monitor(SepiaToneImageTag,y,image->rows,
-          image->client_data);
-        if (status == MagickFalse)
-          break;
+        intensity=(MagickRealType) PixelIntensityToQuantum(p+x);
+        tone=intensity > threshold ? (MagickRealType) QuantumRange :
+          intensity+(MagickRealType) QuantumRange-threshold;
+        (q+x)->red=RoundToQuantum(tone);
+        tone=intensity > (7.0*threshold/6.0) ? (MagickRealType) QuantumRange :
+          intensity+(MagickRealType) QuantumRange-7.0*threshold/6.0;
+        (q+x)->green=RoundToQuantum(tone);
+        tone=intensity < (threshold/6.0) ? 0 : intensity-threshold/6.0;
+        (q+x)->blue=RoundToQuantum(tone);
+        tone=threshold/7.0;
+        if ((MagickRealType) (q+x)->green < tone)
+          (q+x)->green=RoundToQuantum(tone);
+        if ((MagickRealType) (q+x)->blue < tone)
+          (q+x)->blue=RoundToQuantum(tone);
       }
+      if (SyncCacheView(sepia_view) == MagickFalse)
+        continue;
+      if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+          (QuantumTick(y,image->rows) != MagickFalse))
+        {
+          status=image->progress_monitor(SepiaToneImageTag,y,image->rows,
+            image->client_data);
+          if (status == MagickFalse)
+            continue;
+        }
+    }
+    sepia_view=CloseCacheView(sepia_view);
+    image_view=CloseCacheView(image_view);
   }
   (void) NormalizeImage(sepia_image);

ImageMagick/trunk/magick/pixel-private.h

@@ -38 +38 @@
 } RealPixelPacket;
 
-static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
-{
-  if ((pixel->red == pixel->green) && (pixel->green == pixel->blue))
-    return(MagickTrue);
-  return(MagickFalse);
-}
-
 static inline MagickPixelPacket *CloneMagickPixelPacket(
   const MagickPixelPacket *pixel)
@@ -56 +49 @@
   *clone_pixel=(*pixel);
   return(clone_pixel);
+}
+
+static inline MagickBooleanType IsGrayPixel(const PixelPacket *pixel)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+  if ((pixel->red == pixel->green) && (pixel->green == pixel->blue))
+    return(MagickTrue);
+#else
+  if ((fabs(pixel->red-pixel->green) > MagickEpsilon) &&
+      (fabs(pixel->green-pixel->blue) > MagickEpsilon))
+    return(MagickTrue);
+#endif
+  return(MagickFalse);
+}
+
+static inline MagickBooleanType IsMonochromePixel(const PixelPacket *pixel)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+  if (((pixel->red == 0) || (pixel->red == QuantumRange)) &&
+      (pixel->red == pixel->green) && (pixel->green == pixel->blue))
+    return(MagickTrue);
+#else
+  if (((fabs(pixel->red) <= MagickEpsilon) ||
+       (fabs(pixel->red-QuantumRange) <= MagickEpsilon)) &&
+      (fabs(pixel->red-pixel->green) > MagickEpsilon) &&
+      (fabs(pixel->green-pixel->blue) > MagickEpsilon))
+    return(MagickTrue);
+#endif
+  return(MagickFalse);
 }