Changeset 95

Timestamp:

09/12/09 19:10:35 (6 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk/magick

Files:

• cache.c (modified) (1 diff)
• shear.c (modified) (4 diffs)

ImageMagick/trunk/magick/cache.c

@@ -2774 +2774 @@
   *width=2048UL/sizeof(PixelPacket);
   if (GetPixelCacheType(image) == DiskCache)
-    *width=8196UL/sizeof(PixelPacket);
+    *width=8192UL/sizeof(PixelPacket);
   *height=(*width);
 }

ImageMagick/trunk/magick/shear.c

@@ -1074 +1074 @@
       */
       GetPixelCacheTileSize(image,&tile_width,&tile_height);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  #pragma omp parallel for schedule(static,1) shared(progress, status)
+#endif
       for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height)
       {
@@ -1113 +1116 @@
             height=(unsigned long) (tile_height-(tile_y+tile_height-
               image->rows));
-          p=GetCacheViewVirtualPixels(image_view,tile_x,tile_y,width,
-            height,exception);
+          p=GetCacheViewVirtualPixels(image_view,tile_x,tile_y,width,height,
+            exception);
           if (p == (const PixelPacket *) NULL)
             {
@@ -1185 +1188 @@
         Rotate 180 degrees.
       */
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  #pragma omp parallel for schedule(static,1) shared(progress, status)
+#endif
       for (y=0; y < (long) image->rows; y++)
       {
@@ -1258 +1264 @@
       */
       GetPixelCacheTileSize(image,&tile_width,&tile_height);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  #pragma omp parallel for schedule(static,1) shared(progress, status)
+#endif
       for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height)
       {