Changeset 11663

Timestamp:

07/18/08 17:36:48 (6 weeks ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/annotate.c (modified) (5 diffs)

ImageMagick/trunk/magick/annotate.c

@@ -1241 +1241 @@
     y;
 
-  MagickBooleanType
-    active;
-
-  MagickRealType
-    fill_opacity;
-
-  PixelPacket
-    fill_color;
-
   PointInfo
     point,
@@ -1255 +1246 @@
 
   register long
-    i,
-    x;
-
-  register PixelPacket
-    *q;
+    i;
 
   size_t
@@ -1535 +1522 @@
     if (draw_info->render != MagickFalse)
       {
-        long
-          x_offset,
-          y_offset;
-
-        register unsigned char
-          *p;
+        MagickBooleanType
+          status;
 
         ViewInfo
-          *image_view;
+          **image_view;
 
         /*
           Rasterize the glyph.
         */
-        p=bitmap->bitmap.buffer;
-        image_view=AcquireCacheView(image);
+        status=MagickTrue;
+        image_view=AcquireCacheViewThreadSet(image);
+        #pragma omp parallel for
         for (y=0; y < (long) bitmap->bitmap.rows; y++)
         {
+          long
+            x_offset,
+            y_offset;
+
+          MagickBooleanType
+            active;
+
+          MagickRealType
+            fill_opacity;
+
+          PixelPacket
+            fill_color;
+
+          register long
+            id,
+            x;
+
+          register PixelPacket
+            *q;
+
+          register unsigned char
+            *p;
+
+          id=GetCacheViewThreadId();
           x_offset=(long) (point.x+0.5);
           y_offset=(long) (point.y+y+0.5);
           if ((y_offset < 0) || (y_offset >= (long) image->rows))
-            {
-              p+=bitmap->bitmap.width;
-              continue;
-            }
-          q=GetCacheViewPixels(image_view,x_offset,y_offset,
+            continue;
+          q=GetCacheViewPixels(image_view[id],x_offset,y_offset,
             bitmap->bitmap.width,1);
           active=q != (PixelPacket *) NULL ? MagickTrue : MagickFalse;
+          p=bitmap->bitmap.buffer+y*bitmap->bitmap.width;
           for (x=0; x < (long) bitmap->bitmap.width; x++)
           {
-            x_offset=(long) (point.x+x+0.5);
+            x_offset++;
             if ((*p == 0) || (x_offset < 0) ||
                 (x_offset >= (long) image->columns))
@@ -1576 +1582 @@
               fill_opacity=fill_opacity > 0.5 ? 1.0 : 0.0;
             if (active == MagickFalse)
-              q=GetCacheViewPixels(image_view,x_offset,y_offset,1,1);
+              q=GetCacheViewPixels(image_view[id],x_offset,y_offset,1,1);
             if (q == (PixelPacket *) NULL)
               {
@@ -1587 +1593 @@
               fill_color.opacity);
             MagickCompositeOver(&fill_color,fill_opacity,q,q->opacity,q);
-            if (active == MagickFalse)
-              (void) SyncCacheView(image_view);
+            if ((active == MagickFalse) &&
+                (SyncCacheView(image_view[id]) == MagickFalse))
+              status=MagickFalse;
             p++;
             q++;
           }
-          if (SyncCacheView(image_view) == MagickFalse)
-            break;
+          if (SyncCacheView(image_view[id]) == MagickFalse)
+            status=MagickFalse;
         }
-        image_view=DestroyCacheView(image_view);
+        image_view=DestroyCacheViewThreadSet(image_view);
       }
     if ((bitmap->left+bitmap->bitmap.width) > metrics->width)