From: cristy Date: Sun, 6 Jan 2013 18:40:43 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4482 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64c10cdb3428b56ed2c1f77ce932b0e081593dc1;p=imagemagick --- diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 4815ac6d0..1df60ab34 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -1284,7 +1284,7 @@ static void Hull(const Image *image,const ssize_t x_offset, r=p+(y_offset*(columns+2)+x_offset); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,rows,1) + magick_threads(image,image,1,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1321,7 +1321,7 @@ static void Hull(const Image *image,const ssize_t x_offset, s=q-(y_offset*(columns+2)+x_offset); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,rows,1) + magick_threads(image,image,1,1) #endif for (y=0; y < (ssize_t) rows; y++) { diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 0f24e4fd2..86fc662c5 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -1027,7 +1027,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, GetPixelCacheTileSize(image,&tile_width,&tile_height); tile_width=image->columns; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) \ + #pragma omp parallel for schedule(static,4) shared(status) \ magick_threads(image,image,1,1) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) @@ -1152,7 +1152,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, Rotate 180 degrees. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) \ + #pragma omp parallel for schedule(static,4) shared(status) \ magick_threads(image,image,1,1) #endif for (y=0; y < (ssize_t) image->rows; y++) @@ -1250,7 +1250,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, GetPixelCacheTileSize(image,&tile_width,&tile_height); tile_width=image->columns; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) \ + #pragma omp parallel for schedule(static,4) shared(status) \ magick_threads(image,image,1,1) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height)