From: Cristy Date: Sat, 27 Oct 2018 12:50:36 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.8-15~110 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a735524866a89dd840ff2a855adc30e1bf30886a;p=imagemagick ... --- diff --git a/MagickCore/channel.c b/MagickCore/channel.c index 88149aaa6..cd6338fd6 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -800,9 +800,6 @@ MagickExport Image *SeparateImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SeparateImage) -#endif proceed=SetImageProgress(image,SeparateImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index b98c865bc..e8c6d0a2e 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -1052,9 +1052,6 @@ static MagickBooleanType sRGBTransformImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_sRGBTransformImage) -#endif proceed=SetImageProgress(image,sRGBTransformImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2534,9 +2531,6 @@ static MagickBooleanType TransformsRGBImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransformsRGBImage) -#endif proceed=SetImageProgress(image,TransformsRGBImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/compare.c b/MagickCore/compare.c index ccc45ecb2..0290209a2 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -2277,9 +2277,6 @@ MagickExport Image *SimilarityImage(const Image *image,const Image *reference, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SimilarityImage) -#endif proceed=SetImageProgress(image,SimilarityImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 8fa83ca4c..fb5f1243d 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -511,9 +511,6 @@ static MagickBooleanType CompositeOverImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CompositeImage) -#endif proceed=SetImageProgress(image,CompositeImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -678,11 +675,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CompositeImage) -#endif - proceed=SetImageProgress(image,CompositeImageTag, - (MagickOffsetType) y,image->rows); + proceed=SetImageProgress(image,CompositeImageTag,(MagickOffsetType) + y,image->rows); if (proceed == MagickFalse) status=MagickFalse; } @@ -754,11 +748,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CompositeImage) -#endif - proceed=SetImageProgress(image,CompositeImageTag, - (MagickOffsetType) y,image->rows); + proceed=SetImageProgress(image,CompositeImageTag,(MagickOffsetType) + y,image->rows); if (proceed == MagickFalse) status=MagickFalse; } @@ -2335,9 +2326,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CompositeImage) -#endif proceed=SetImageProgress(image,CompositeImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 1605b7a57..311a766dc 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -454,9 +454,6 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_FrameImage) -#endif proceed=SetImageProgress(image,FrameImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -723,9 +720,6 @@ MagickExport MagickBooleanType RaiseImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_RaiseImage) -#endif proceed=SetImageProgress(image,RaiseImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -787,9 +781,6 @@ MagickExport MagickBooleanType RaiseImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_RaiseImage) -#endif proceed=SetImageProgress(image,RaiseImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -862,9 +853,6 @@ MagickExport MagickBooleanType RaiseImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_RaiseImage) -#endif proceed=SetImageProgress(image,RaiseImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/distort.c b/MagickCore/distort.c index b38a49fc5..698c53c81 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2741,9 +2741,6 @@ if ( d.x == 0.5 && d.y == 0.5 ) { MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_DistortImage) -#endif proceed=SetImageProgress(image,DistortImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -3270,9 +3267,6 @@ MagickExport Image *SparseColorImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SparseColorImage) -#endif proceed=SetImageProgress(image,SparseColorTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 9079c8019..119a11520 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -390,9 +390,6 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_AdaptiveBlurImage) -#endif proceed=SetImageProgress(image,AdaptiveBlurImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -710,9 +707,6 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_AdaptiveSharpenImage) -#endif proceed=SetImageProgress(image,AdaptiveSharpenImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1623,9 +1617,6 @@ MagickExport Image *KuwaharaImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_KuwaharaImage) -#endif proceed=SetImageProgress(image,KuwaharaImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -2205,9 +2196,6 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_MotionBlurImage) -#endif proceed=SetImageProgress(image,BlurImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -3016,9 +3004,6 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_RotationalBlurImage) -#endif proceed=SetImageProgress(image,BlurImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -3351,9 +3336,6 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SelectiveBlurImage) -#endif proceed=SetImageProgress(image,SelectiveBlurImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -3591,9 +3573,6 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ShadeImage) -#endif proceed=SetImageProgress(image,ShadeImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -3854,9 +3833,6 @@ MagickExport Image *SpreadImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SpreadImage) -#endif proceed=SetImageProgress(image,SpreadImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -4026,9 +4002,6 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_UnsharpMaskImage) -#endif proceed=SetImageProgress(image,SharpenImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index e9e828f19..a49da7532 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -413,9 +413,6 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ClutImage) -#endif proceed=SetImageProgress(image,ClutImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -789,9 +786,6 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ColorDecisionListImageChannel) -#endif proceed=SetImageProgress(image,ColorDecisionListCorrectImageTag, progress++,image->rows); if (proceed == MagickFalse) @@ -962,9 +956,6 @@ MagickExport MagickBooleanType ContrastImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ContrastImage) -#endif proceed=SetImageProgress(image,ContrastImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1252,9 +1243,6 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ContrastStretchImage) -#endif proceed=SetImageProgress(image,ContrastStretchImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1448,9 +1436,6 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_EnhanceImage) -#endif proceed=SetImageProgress(image,EnhanceImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1713,9 +1698,6 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_EqualizeImage) -#endif proceed=SetImageProgress(image,EqualizeImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1874,9 +1856,6 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_GammaImage) -#endif proceed=SetImageProgress(image,GammaCorrectImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2080,9 +2059,6 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_GrayscaleImage) -#endif proceed=SetImageProgress(image,GrayscaleImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2281,9 +2257,6 @@ MagickExport MagickBooleanType HaldClutImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_HaldClutImage) -#endif proceed=SetImageProgress(image,HaldClutImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -2446,9 +2419,6 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_LevelImage) -#endif proceed=SetImageProgress(image,LevelImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -2596,9 +2566,6 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_LevelizeImage) -#endif proceed=SetImageProgress(image,LevelizeImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -3309,9 +3276,6 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ModulateImage) -#endif proceed=SetImageProgress(image,ModulateImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -3446,9 +3410,6 @@ MagickExport MagickBooleanType NegateImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_NegateImage) -#endif proceed=SetImageProgress(image,NegateImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -3503,9 +3464,6 @@ MagickExport MagickBooleanType NegateImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_NegateImage) -#endif proceed=SetImageProgress(image,NegateImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -3805,9 +3763,6 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SigmoidalContrastImage) -#endif proceed=SetImageProgress(image,SigmoidalContrastImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/feature.c b/MagickCore/feature.c index b36f44e71..e405aed79 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -554,9 +554,6 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CannyEdgeImage) -#endif proceed=SetImageProgress(image,CannyEdgeImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1945,9 +1942,6 @@ MagickExport Image *HoughLineImage(const Image *image,const size_t width, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CannyEdgeImage) -#endif proceed=SetImageProgress(image,CannyEdgeImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2321,9 +2315,6 @@ MagickExport Image *MeanShiftImage(const Image *image,const size_t width, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_MeanShiftImage) -#endif proceed=SetImageProgress(image,MeanShiftImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c index faeac7367..b0bec44e4 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -332,9 +332,6 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ComplexImages) -#endif proceed=SetImageProgress(images,ComplexImageTag,progress++, images->rows); if (proceed == MagickFalse) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index a6517a83e..b3ce54233 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -387,9 +387,6 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_AddNoiseImage) -#endif proceed=SetImageProgress(image,AddNoiseImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -543,9 +540,6 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_BlueShiftImage) -#endif proceed=SetImageProgress(image,BlueShiftImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -787,9 +781,6 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ColorizeImage) -#endif proceed=SetImageProgress(image,ColorizeImageTag,progress++, colorize_image->rows); if (proceed == MagickFalse) @@ -1008,9 +999,6 @@ MagickExport Image *ColorMatrixImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ColorMatrixImage) -#endif proceed=SetImageProgress(image,ColorMatrixImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -3222,9 +3210,6 @@ MagickExport Image *FxImage(const Image *image,const char *expression, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_FxImage) -#endif proceed=SetImageProgress(image,FxImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -3437,9 +3422,6 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ImplodeImage) -#endif proceed=SetImageProgress(canvas_image,ImplodeImageTag,progress++, canvas_image->rows); if (proceed == MagickFalse) @@ -3672,9 +3654,6 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_MorphImages) -#endif proceed=SetImageProgress(image,MorphImageTag,scene, GetImageListLength(image)); if (proceed == MagickFalse) @@ -4307,9 +4286,6 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SepiaToneImage) -#endif proceed=SetImageProgress(image,SepiaToneImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -4753,9 +4729,6 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SolarizeImage) -#endif proceed=SetImageProgress(image,SolarizeImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -5275,9 +5248,6 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SwirlImage) -#endif proceed=SetImageProgress(canvas_image,SwirlImageTag,progress++, canvas_image->rows); if (proceed == MagickFalse) @@ -5473,9 +5443,6 @@ MagickExport Image *TintImage(const Image *image,const char *blend, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TintImage) -#endif proceed=SetImageProgress(image,TintImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -5744,10 +5711,8 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_WaveImage) -#endif - proceed=SetImageProgress(canvas_image,WaveImageTag,progress++,canvas_image->rows); + proceed=SetImageProgress(canvas_image,WaveImageTag,progress++, + canvas_image->rows); if (proceed == MagickFalse) status=MagickFalse; } diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c index abcfd2fe1..f5ccd88bf 100644 --- a/MagickCore/image-view.c +++ b/MagickCore/image-view.c @@ -294,9 +294,6 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator( MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_DuplexTransferImageViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse) @@ -581,9 +578,6 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_GetImageViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse) @@ -931,9 +925,6 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SetImageViewIterator) -#endif proceed=SetImageProgress(destination_image,destination->description, progress++,destination->extent.height); if (proceed == MagickFalse) @@ -1070,9 +1061,6 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransferImageViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse) @@ -1187,9 +1175,6 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_UpdateImageViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse) diff --git a/MagickCore/image.c b/MagickCore/image.c index 5ec2250dc..9604c776d 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -1138,9 +1138,6 @@ MagickExport MagickBooleanType CopyImagePixels(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CopyImage) -#endif proceed=SetImageProgress(image,CopyImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/magick.c b/MagickCore/magick.c index 532e95b7d..549f770c5 100644 --- a/MagickCore/magick.c +++ b/MagickCore/magick.c @@ -1525,6 +1525,7 @@ MagickExport void MagickCoreGenesis(const char *path, (void) XComponentGenesis(); #endif (void) RegistryComponentGenesis(); + (void) MonitorComponentGenesis(); instantiate_magickcore=MagickTrue; UnlockMagickMutex(); } @@ -1556,6 +1557,7 @@ MagickExport void MagickCoreTerminus(void) UnlockMagickMutex(); return; } + MonitorComponentTerminus(); RegistryComponentTerminus(); #if defined(MAGICKCORE_X11_DELEGATE) XComponentTerminus(); diff --git a/MagickCore/monitor-private.h b/MagickCore/monitor-private.h index 541ca80f2..801f06aea 100644 --- a/MagickCore/monitor-private.h +++ b/MagickCore/monitor-private.h @@ -24,19 +24,6 @@ extern "C" { #endif -static inline MagickBooleanType SetImageProgress(const Image *image, - const char *tag,const MagickOffsetType offset,const MagickSizeType extent) -{ - char - message[MagickPathExtent]; - - if (image->progress_monitor == (MagickProgressMonitor) NULL) - return(MagickTrue); - (void) FormatLocaleString(message,MagickPathExtent,"%s/%s",tag, - image->filename); - return(image->progress_monitor(message,offset,extent,image->client_data)); -} - #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/MagickCore/monitor.c b/MagickCore/monitor.c index ca6df2d50..b54fc61f0 100644 --- a/MagickCore/monitor.c +++ b/MagickCore/monitor.c @@ -45,6 +45,114 @@ #include "MagickCore/log.h" #include "MagickCore/monitor.h" +/* + Static declarations. +*/ +static SemaphoreInfo + *monitor_semaphore = (SemaphoreInfo *) NULL; + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % ++ M o n i t o r C o m p o n e n t G e n e s i s % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% MonitorComponentGenesis() instantiates the monitor component. +% +% The format of the MonitorComponentGenesis method is: +% +% MagickBooleanMonitor MonitorComponentGenesis(void) +% +*/ +MagickPrivate MagickBooleanType MonitorComponentGenesis(void) +{ + if (monitor_semaphore == (SemaphoreInfo *) NULL) + monitor_semaphore=AcquireSemaphoreInfo(); + return(MagickTrue); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % ++ M o n i t o r C o m p o n e n t T e r m i n u s % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% MonitorComponentTerminus() destroy monitor component. +% +% The format of the MonitorComponentTerminus method is: +% +% void MonitorComponentTerminus(void) +% +*/ +MagickPrivate void MonitorComponentTerminus(void) +{ + if (monitor_semaphore == (SemaphoreInfo *) NULL) + ActivateSemaphoreInfo(&monitor_semaphore); + LockSemaphoreInfo(monitor_semaphore); + UnlockSemaphoreInfo(monitor_semaphore); + RelinquishSemaphoreInfo(&monitor_semaphore); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % +% S e t I m a g e P r o g r e s s % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% SetImageProgress() returns the progress of an image processing operation. +% +% The format of the SetImageProgress method is: +% +% MagickBooleanType SetImageProgress(const char *text, +% const MagickOffsetType offset,const MagickSizeType extent) +% +% A description of each parameter follows: +% +% o image: the image. +% +% o text: description of the image processing operation. +% +% o offset: the offset relative to the extent parameter. +% +% o extent: the extent of the progress. +% +*/ +MagickExport MagickBooleanType SetImageProgress(const Image *image, + const char *tag,const MagickOffsetType offset,const MagickSizeType extent) +{ + char + message[MagickPathExtent]; + + MagickBooleanType + status; + + if (image->progress_monitor == (MagickProgressMonitor) NULL) + return(MagickTrue); + (void) FormatLocaleString(message,MagickPathExtent,"%s/%s",tag, + image->filename); + if (monitor_semaphore == (SemaphoreInfo *) NULL) + ActivateSemaphoreInfo(&monitor_semaphore); + LockSemaphoreInfo(monitor_semaphore); + status=image->progress_monitor(message,offset,extent,image->client_data); + UnlockSemaphoreInfo(monitor_semaphore); + return(status); +} + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % diff --git a/MagickCore/monitor.h b/MagickCore/monitor.h index 819567f45..2cb3a0c9a 100644 --- a/MagickCore/monitor.h +++ b/MagickCore/monitor.h @@ -26,6 +26,10 @@ typedef MagickBooleanType (*MagickProgressMonitor)(const char *,const MagickOffsetType, const MagickSizeType,void *); +MagickExport MagickBooleanType + SetImageProgress(const Image *,const char *,const MagickOffsetType, + const MagickSizeType); + MagickExport MagickProgressMonitor SetImageProgressMonitor(Image *,const MagickProgressMonitor,void *), SetImageInfoProgressMonitor(ImageInfo *,const MagickProgressMonitor,void *); diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 258432562..8c3e855ad 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2773,9 +2773,6 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_MorphologyPrimitive) -#endif proceed=SetImageProgress(image,MorphologyTag,progress++, image->rows); if (proceed == MagickFalse) @@ -3202,9 +3199,6 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_MorphologyPrimitive) -#endif proceed=SetImageProgress(image,MorphologyTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 609e53d59..c27124f2d 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -846,9 +846,6 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_OilPaintImage) -#endif proceed=SetImageProgress(linear_image,OilPaintImageTag,progress++, linear_image->rows); if (proceed == MagickFalse) @@ -1000,9 +997,6 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_OpaquePaintImage) -#endif proceed=SetImageProgress(image,OpaquePaintImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1127,9 +1121,6 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransparentPaintImage) -#endif proceed=SetImageProgress(image,TransparentPaintImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1261,9 +1252,6 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransparentPaintImageChroma) -#endif proceed=SetImageProgress(image,TransparentPaintImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/profile.c b/MagickCore/profile.c index 45c00135d..6e83b1e02 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -1232,9 +1232,6 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ProfileImage) -#endif proceed=SetImageProgress(image,ProfileImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index dcb8cc9f5..8ae278a8e 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -631,9 +631,6 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_AssignImageColors) -#endif proceed=SetImageProgress(image,AssignImageTag,(MagickOffsetType) y, image->rows); if (proceed == MagickFalse) @@ -2453,9 +2450,6 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_PosterizeImage) -#endif proceed=SetImageProgress(image,PosterizeImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 44b416746..f034deac8 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1812,9 +1812,6 @@ MagickExport Image *InterpolativeResizeImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_InterpolativeResizeImage) -#endif proceed=SetImageProgress(image,InterpolativeResizeImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2210,9 +2207,6 @@ MagickExport Image *MagnifyImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_MagnifyImage) -#endif proceed=SetImageProgress(image,MagnifyImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -2627,9 +2621,6 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_HorizontalFilter) -#endif proceed=SetImageProgress(image,ResizeImageTag,(*offset)++,span); if (proceed == MagickFalse) status=MagickFalse; @@ -2840,9 +2831,6 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_VerticalFilter) -#endif proceed=SetImageProgress(image,ResizeImageTag,(*offset)++,span); if (proceed == MagickFalse) status=MagickFalse; @@ -3159,9 +3147,6 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_SampleImage) -#endif proceed=SetImageProgress(image,SampleImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 055ffeeb9..6af12dbf2 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -405,9 +405,6 @@ static MagickBooleanType Classify(Image *image,short **extrema, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_Classify) -#endif proceed=SetImageProgress(image,SegmentImageTag,progress++,2* image->rows); if (proceed == MagickFalse) @@ -646,11 +643,8 @@ static MagickBooleanType Classify(Image *image,short **extrema, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_Classify) -#endif - proceed=SetImageProgress(image,SegmentImageTag,progress++, - 2*image->rows); + proceed=SetImageProgress(image,SegmentImageTag,progress++,2* + image->rows); if (proceed == MagickFalse) status=MagickFalse; } diff --git a/MagickCore/shear.c b/MagickCore/shear.c index cebc4516d..ecd8939b8 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -854,9 +854,6 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_IntegralRotateImage) -#endif proceed=SetImageProgress(image,RotateImageTag,progress+=tile_height, image->rows); if (proceed == MagickFalse) @@ -935,9 +932,6 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_IntegralRotateImage) -#endif proceed=SetImageProgress(image,RotateImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1289,9 +1283,6 @@ static MagickBooleanType XShearImage(Image *image,const double degrees, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_XShearImage) -#endif proceed=SetImageProgress(image,XShearImageTag,progress++,height); if (proceed == MagickFalse) status=MagickFalse; @@ -1507,9 +1498,6 @@ static MagickBooleanType YShearImage(Image *image,const double degrees, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_YShearImage) -#endif proceed=SetImageProgress(image,YShearImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index a0907f834..ee83a009b 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -597,9 +597,6 @@ MagickExport Image *EvaluateImages(const Image *images, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_EvaluateImages) -#endif proceed=SetImageProgress(images,EvaluateImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -749,9 +746,6 @@ MagickExport Image *EvaluateImages(const Image *images, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_EvaluateImages) -#endif proceed=SetImageProgress(images,EvaluateImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -858,9 +852,6 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_EvaluateImage) -#endif proceed=SetImageProgress(image,EvaluateImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1082,9 +1073,6 @@ MagickExport MagickBooleanType FunctionImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_FunctionImage) -#endif proceed=SetImageProgress(image,FunctionImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -2324,9 +2312,6 @@ MagickExport Image *PolynomialImage(const Image *images, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_PolynomialImages) -#endif proceed=SetImageProgress(images,PolynomialImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -3030,9 +3015,6 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_StatisticImage) -#endif proceed=SetImageProgress(image,StatisticImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index e2dd37b11..51974645c 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -338,9 +338,6 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_AdaptiveThresholdImage) -#endif proceed=SetImageProgress(image,AdaptiveThresholdImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -877,9 +874,6 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_BilevelImage) -#endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1038,9 +1032,6 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_BlackThresholdImage) -#endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -1165,9 +1156,6 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ClampImage) -#endif proceed=SetImageProgress(image,ClampImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1814,9 +1802,6 @@ MagickExport MagickBooleanType OrderedDitherImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_OrderedDitherImage) -#endif proceed=SetImageProgress(image,DitherImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1961,9 +1946,6 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_PerceptibleImage) -#endif proceed=SetImageProgress(image,PerceptibleImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -2104,9 +2086,6 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_RandomThresholdImage) -#endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2249,9 +2228,6 @@ MagickExport MagickBooleanType RangeThresholdImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_RangeThresholdImage) -#endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2410,9 +2386,6 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_WhiteThresholdImage) -#endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickCore/transform.c b/MagickCore/transform.c index f1b3e7ee0..2f4cef777 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -303,9 +303,6 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ChopImage) -#endif proceed=SetImageProgress(image,ChopImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -368,9 +365,6 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ChopImage) -#endif proceed=SetImageProgress(image,ChopImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -718,9 +712,6 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_CropImage) -#endif proceed=SetImageProgress(image,CropImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1064,9 +1055,6 @@ MagickExport Image *ExcerptImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_ExcerptImage) -#endif proceed=SetImageProgress(image,ExcerptImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1259,9 +1247,6 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_FlipImage) -#endif proceed=SetImageProgress(image,FlipImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1394,9 +1379,6 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_FlopImage) -#endif proceed=SetImageProgress(image,FlopImageTag,progress++,image->rows); if (proceed == MagickFalse) status=MagickFalse; @@ -1865,9 +1847,6 @@ MagickExport Image *SpliceImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransposeImage) -#endif proceed=SetImageProgress(image,SpliceImageTag,progress++, splice_image->rows); if (proceed == MagickFalse) @@ -1956,9 +1935,6 @@ MagickExport Image *SpliceImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransposeImage) -#endif proceed=SetImageProgress(image,SpliceImageTag,progress++, splice_image->rows); if (proceed == MagickFalse) @@ -2189,9 +2165,6 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransposeImage) -#endif proceed=SetImageProgress(image,TransposeImageTag,progress++, image->rows); if (proceed == MagickFalse) @@ -2331,9 +2304,6 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_TransverseImage) -#endif proceed=SetImageProgress(image,TransverseImageTag,progress++, image->rows); if (proceed == MagickFalse) diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index 84b866e26..fc5263348 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -372,9 +372,6 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickWand_DuplexTransferWandViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse) @@ -579,9 +576,6 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickWand_GetWandViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse) @@ -989,9 +983,6 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickWand_SetWandViewIterator) -#endif proceed=SetImageProgress(destination_image,destination->description, progress++,destination->extent.height); if (proceed == MagickFalse) @@ -1151,9 +1142,6 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickWand_TransferWandViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse) @@ -1284,9 +1272,6 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickWand_UpdateWandViewIterator) -#endif proceed=SetImageProgress(source_image,source->description,progress++, source->extent.height); if (proceed == MagickFalse)