(no commit message)

diff --git a/magick/cache.c b/magick/cache.c
index eb8e30e836ba5cec60c574cfae8bda9cdd3d3d27..30ca4dc447d8eaf6b8823208b3714f6cd00aa334 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -2773,7 +2773,7 @@ MagickExport void GetPixelCacheTileSize(const Image *image,unsigned long *width,
   assert(cache_info->signature == MagickSignature);
   *width=2048UL/sizeof(PixelPacket);
   if (GetPixelCacheType(image) == DiskCache)
-    *width=8196UL/sizeof(PixelPacket);
+    *width=8192UL/sizeof(PixelPacket);
   *height=(*width);
 }
 \f

diff --git a/magick/shear.c b/magick/shear.c
index eab86fb35a6527f38290508a0b7eca8001c79e11..a82b739938db48035a408ef7b19a79d8e405f436 100644 (file)
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -1073,6 +1073,9 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
         Rotate 90 degrees.
       */
       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)
       {
         register long
@@ -1112,8 +1115,8 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
           if ((tile_y+(long) tile_height) > (long) image->rows)
             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)
             {
               status=MagickFalse;
@@ -1184,6 +1187,9 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
       /*
         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++)
       {
         MagickBooleanType
@@ -1257,6 +1263,9 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
         Rotate 270 degrees.
       */
       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)
       {
         register long