From 195938723ce0d7e6780967dd2ada36aec15fe4bf Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 22 Jan 2012 02:00:33 +0000 Subject: [PATCH] --- MagickCore/composite.c | 4 ++-- MagickCore/decorate.c | 6 +++--- MagickCore/effect.c | 2 +- MagickCore/enhance.c | 20 ++++++++++---------- MagickCore/image-view.c | 10 +++++----- MagickCore/image.c | 4 ++-- MagickCore/resize.c | 4 ++-- MagickCore/shear.c | 6 +++--- MagickCore/statistic.c | 4 ++-- MagickCore/transform.c | 10 +++++----- MagickWand/wand-view.c | 10 +++++----- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 0289911b5..7532102a0 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -2297,7 +2297,7 @@ MagickExport MagickBooleanType TextureImage(Image *image, Tile texture onto the image background. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture_image->rows) { @@ -2345,7 +2345,7 @@ MagickExport MagickBooleanType TextureImage(Image *image, image_view=AcquireCacheView(image); texture_view=AcquireCacheView(texture_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index d02dae8db..ace1c5a3c 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -682,7 +682,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) raise_info->height; y++) { @@ -771,7 +771,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++) { @@ -843,7 +843,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/effect.c b/MagickCore/effect.c index b8840e779..55dc459e0 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -2154,7 +2154,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, motion_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index de9ade01e..a721044e3 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -1766,15 +1766,15 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, CacheView *image_view; - double - *gamma_map; - MagickBooleanType status; MagickOffsetType progress; + Quantum + *gamma_map; + register ssize_t i; @@ -1790,8 +1790,8 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (gamma == 1.0) return(MagickTrue); - gamma_map=(double *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*gamma_map)); - if (gamma_map == (double *) NULL) + gamma_map=(Quantum *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*gamma_map)); + if (gamma_map == (Quantum *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); (void) ResetMagickMemory(gamma_map,0,(MaxMap+1)*sizeof(*gamma_map)); @@ -1800,15 +1800,15 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, #pragma omp parallel for #endif for (i=0; i <= (ssize_t) MaxMap; i++) - gamma_map[i]=(MagickRealType) ScaleMapToQuantum(( - MagickRealType) (MaxMap*pow((double) i/MaxMap,1.0/gamma))); + gamma_map[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*pow((double) i/ + MaxMap,1.0/gamma))); if (image->storage_class == PseudoClass) { /* Gamma-correct colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -1867,7 +1867,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, channel=GetPixelChannelMapChannel(image,i); traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) - q[i]=ClampToQuantum(gamma_map[ScaleQuantumToMap(q[i])]); + q[i]=gamma_map[ScaleQuantumToMap(q[i])]; } q+=GetPixelChannels(image); } @@ -1888,7 +1888,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, } } image_view=DestroyCacheView(image_view); - gamma_map=(double *) RelinquishMagickMemory(gamma_map); + gamma_map=(Quantum *) RelinquishMagickMemory(gamma_map); if (image->gamma != 0.0) image->gamma*=gamma; return(status); diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c index 90e9a4987..7b19052a4 100644 --- a/MagickCore/image-view.c +++ b/MagickCore/image-view.c @@ -241,7 +241,7 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator( status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -546,7 +546,7 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -883,7 +883,7 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(destination->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(destination->number_threads) #endif for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++) { @@ -1039,7 +1039,7 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -1163,7 +1163,7 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { diff --git a/MagickCore/image.c b/MagickCore/image.c index bd2dbc6ee..0531def15 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -515,7 +515,7 @@ MagickExport Image *AppendImages(const Image *images, y_offset-=geometry.y; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2252,7 +2252,7 @@ MagickExport Image *SeparateImage(const Image *image, image_view=AcquireCacheView(image); separate_view=AcquireCacheView(separate_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 7db0a8a91..358e573ae 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1579,7 +1579,7 @@ MagickExport Image *InterpolativeResizeImage(const Image *image, scale.x=(double) image->columns/resize_image->columns; scale.y=(double) image->rows/resize_image->rows; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) resize_image->rows; y++) { @@ -2746,7 +2746,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, image_view=AcquireCacheView(image); sample_view=AcquireCacheView(sample_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) sample_image->rows; y++) { diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 219d058d9..43bfe5854 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -1022,7 +1022,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, */ GetPixelCacheTileSize(image,&tile_width,&tile_height); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { @@ -1140,7 +1140,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, Rotate 180 degrees. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1231,7 +1231,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, */ GetPixelCacheTileSize(image,&tile_width,&tile_height); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index dcc27cbda..a06f38bf5 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -1276,7 +1276,7 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image, sum_fourth_power=0.0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1399,7 +1399,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, *minima=MagickHuge; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 254acb698..cfe68b65f 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -160,7 +160,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, image_view=AcquireCacheView(image); chop_view=AcquireCacheView(chop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) extent.y; y++) { @@ -230,7 +230,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, Extract chop image. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++) { @@ -585,7 +585,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, image_view=AcquireCacheView(image); crop_view=AcquireCacheView(crop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) crop_image->rows; y++) { @@ -1140,7 +1140,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); flip_view=AcquireCacheView(flip_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) flip_image->rows; y++) { @@ -1280,7 +1280,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); flop_view=AcquireCacheView(flop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) flop_image->rows; y++) { diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index 6c1ac4c30..e31719e17 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -289,7 +289,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -535,7 +535,7 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -924,7 +924,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(destination->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(destination->number_threads) #endif for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++) { @@ -1089,7 +1089,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -1236,7 +1236,7 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads) + #pragma omp parallel for schedule(static) shared(progress,status) num_threads(source->number_threads) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { -- 2.40.0