From cb7dfccc2e3a9d57a44294cde5228e6f3f27d003 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 6 Jan 2013 18:34:59 +0000 Subject: [PATCH] --- MagickCore/attribute.c | 2 +- MagickCore/cache.c | 3 ++- MagickCore/colormap.c | 2 +- MagickCore/colorspace.c | 34 +++++++++++++++++----------------- MagickCore/decorate.c | 4 ++-- MagickCore/draw.c | 32 ++++---------------------------- MagickCore/quantize.c | 2 +- MagickCore/shear.c | 26 +++----------------------- MagickCore/transform.c | 10 ++-------- 9 files changed, 33 insertions(+), 82 deletions(-) diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index b8ffd008d..72b1eebe9 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -938,7 +938,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->colors,1) + magick_threads(image,image,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { diff --git a/MagickCore/cache.c b/MagickCore/cache.c index a35be2581..8dac3b186 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -4914,7 +4914,8 @@ static MagickBooleanType SetCacheAlphaChannel(Image *image,const Quantum alpha, status=MagickTrue; image_view=AcquireVirtualCacheView(image,exception); /* must be virtual */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) magick_threads(image,image,1,1) + #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++) { diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index 4b8aabc6a..4da8b6236 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -332,7 +332,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->colors,1) + magick_threads(image,image,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) image->colormap[i].alpha=(double) i; diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 5484a1bfc..a50086c73 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -967,7 +967,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, film_gamma); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) logmap[i]=ScaleMapToQuantum((double) (MaxMap*(reference_white+ @@ -1319,7 +1319,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0f)/2.0f; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1352,7 +1352,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0f)/2.0f; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1384,7 +1384,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0f)/2.0f; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1455,7 +1455,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0f)/2.0f; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1487,7 +1487,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0f)/2.0f; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1519,7 +1519,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0f)/2.0f; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1542,7 +1542,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3222,7 +3222,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3253,7 +3253,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3283,7 +3283,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3312,7 +3312,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3346,7 +3346,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3376,7 +3376,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3406,7 +3406,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3429,7 +3429,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3548,7 +3548,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,MaxMap,1) + magick_threads(image,image,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 3032f2193..cbac0e502 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -800,7 +800,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows-2*raise_info->height,1) + magick_threads(image,image,1,1) #endif for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++) { @@ -886,7 +886,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows-2*raise_info->height,1) + magick_threads(image,image,1,1) #endif for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 5c4e855a4..52a6eabea 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1105,11 +1105,6 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, SegmentInfo edge; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - size_t - height; -#endif - ssize_t start, stop, @@ -1166,14 +1161,11 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, GetPixelInfo(image,&zero); start=(ssize_t) ceil(edge.y1-0.5); stop=(ssize_t) floor(edge.y2+0.5); -#if defined(MAGICKCORE_OPENMP_SUPPORT) - height=(size_t) (floor(edge.y2+0.5)-ceil(edge.y1-0.5)); -#endif source_view=AcquireVirtualCacheView(source,exception); image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(source,image,height,1) + magick_threads(source,image,1,1) #endif for (y=start; y <= stop; y++) { @@ -3235,11 +3227,6 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, RectangleInfo bounding_box; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - size_t - height; -#endif - ssize_t y; @@ -3259,13 +3246,10 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, bounding_box=gradient->bounding_box; status=MagickTrue; GetPixelInfo(image,&zero); -#if defined(MAGICKCORE_OPENMP_SUPPORT) - height=bounding_box.height-bounding_box.y; -#endif image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,height,1) + magick_threads(image,image,1,1) #endif for (y=bounding_box.y; y < (ssize_t) bounding_box.height; y++) { @@ -3809,11 +3793,6 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, SegmentInfo bounds; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - size_t - height; -#endif - ssize_t start, stop, @@ -3868,9 +3847,6 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, image->rows ? (double) image->rows-1 : bounds.y2; status=MagickTrue; image_view=AcquireAuthenticCacheView(image,exception); -#if defined(MAGICKCORE_OPENMP_SUPPORT) - height=(size_t) (floor(bounds.y2+0.5)-ceil(bounds.y1-0.5)); -#endif if (primitive_info->coordinates == 1) { /* @@ -3880,7 +3856,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, stop=(ssize_t) floor(bounds.y2+0.5); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,height,1) + magick_threads(image,image,1,1) #endif for (y=start; y <= stop; y++) { @@ -3943,7 +3919,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, stop=(ssize_t) floor(bounds.y2+0.5); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,height,1) + magick_threads(image,image,1,1) #endif for (y=start; y <= stop; y++) { diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index e292b4441..a732bae85 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -2379,7 +2379,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->colors,1) + magick_threads(image,image,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 271f1f917..0f24e4fd2 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -573,7 +573,7 @@ static void RadonProjection(const Image *image,RadonInfo *source_cells, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,p->width,1) + magick_threads(image,image,1,1) #endif for (x=0; x < (ssize_t) p->width; x++) { @@ -704,7 +704,7 @@ static MagickBooleanType RadonTransform(const Image *image, (void) ResetRadonCells(source_cells); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_threads(image,image,1,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1154,26 +1154,6 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ magick_threads(image,image,1,1) -#endif - for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) - { - register ssize_t - tile_x; - - if (status == MagickFalse) - continue; - tile_x=0; - for ( ; tile_x < (ssize_t) image->columns; tile_x+=(ssize_t) tile_width) - { - MagickBooleanType - sync; - - register const Quantum - *restrict p; - - register Quantum - *restrict q; - #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1271,7 +1251,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, tile_width=image->columns; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,image->rows/tile_height,1) + magick_threads(image,image,1,1) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 1b68a35f4..5e13c9e3a 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -1769,11 +1769,6 @@ MagickExport Image *SpliceImage(const Image *image, RectangleInfo splice_geometry; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - size_t - height; -#endif - ssize_t y; @@ -1861,7 +1856,7 @@ MagickExport Image *SpliceImage(const Image *image, splice_view=AcquireAuthenticCacheView(splice_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,splice_image,splice_geometry.y,1) + magick_threads(image,splice_image,1,1) #endif for (y=0; y < (ssize_t) splice_geometry.y; y++) { @@ -1965,9 +1960,8 @@ MagickExport Image *SpliceImage(const Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - height=splice_image->rows-2*splice_geometry.height; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,splice_image,height,1) + magick_threads(image,splice_image,1,1) #endif for (y=(ssize_t) (splice_geometry.y+splice_geometry.height); y < (ssize_t) splice_image->rows; y++) -- 2.50.1