From: cristy Date: Thu, 13 Dec 2012 14:15:41 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4610 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4bc52025ac134838f6a62b8dc8ea6cfacab91796;p=imagemagick --- diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp index 8c6b5cf1d..df5b98939 100644 --- a/Magick++/lib/Pixels.cpp +++ b/Magick++/lib/Pixels.cpp @@ -24,7 +24,7 @@ namespace Magick // Construct pixel view using specified image. Magick::Pixels::Pixels( Magick::Image &image_ ) : _image(image_), - _view(AcquireVirtualCacheView(_image.image(),&_exception)), + _view(AcquireVirtualCacheView(_image.image())), _x(0), _y(0), _columns(0), diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index cd5722f08..1f643131c 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1386,7 +1386,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, Rasterize the glyph. */ status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); p=bitmap->bitmap.buffer; for (y=0; y < (ssize_t) bitmap->bitmap.rows; y++) { @@ -1824,7 +1824,7 @@ static MagickBooleanType RenderPostscript(Image *image, (void) SetImageAlphaChannel(annotate_image,OpaqueAlphaChannel, exception); fill_color=draw_info->fill; - annotate_view=AcquireAuthenticCacheView(annotate_image,exception); + annotate_view=AcquireAuthenticCacheView(annotate_image); for (y=0; y < (ssize_t) annotate_image->rows; y++) { register ssize_t diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 78237e7b7..b0aefa5a3 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -151,7 +151,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, bounds.x=(ssize_t) image->columns; bounds.y=(ssize_t) image->rows; GetPixelInfo(image,&target[0]); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); p=GetCacheViewVirtualPixels(image_view,0,0,1,1,exception); if (p == (const Quantum *) NULL) { @@ -352,7 +352,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) current_depth=(size_t *) RelinquishMagickMemory(current_depth); return(depth); } - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if !defined(MAGICKCORE_HDRI_SUPPORT) if (QuantumRange <= MaxMap) { @@ -696,7 +696,7 @@ MagickExport MagickBooleanType IsImageGray(const Image *image, (IsRGBColorspace(image->colorspace) == MagickFalse)) return(MagickFalse); type=BilevelType; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -781,7 +781,7 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image, (IsRGBColorspace(image->colorspace) == MagickFalse)) return(MagickFalse); type=BilevelType; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -858,7 +858,7 @@ MagickExport MagickBooleanType IsImageOpaque(const Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->alpha_trait != BlendPixelTrait) return(MagickTrue); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -957,7 +957,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, } } status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if !defined(MAGICKCORE_HDRI_SUPPORT) if (QuantumRange <= MaxMap) { diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c index 0f1d8dbb9..81be7a108 100644 --- a/MagickCore/cache-view.c +++ b/MagickCore/cache-view.c @@ -98,8 +98,7 @@ struct _CacheView % % The format of the AcquireAuthenticCacheView method is: % -% CacheView *AcquireAuthenticCacheView(const Image *image, -% ExceptionInfo *exception) +% CacheView *AcquireAuthenticCacheView(const Image *image) % % A description of each parameter follows: % @@ -108,22 +107,26 @@ struct _CacheView % o exception: return any errors or warnings in this structure. % */ -MagickExport CacheView *AcquireAuthenticCacheView(const Image *image, - ExceptionInfo *exception) +MagickExport CacheView *AcquireAuthenticCacheView(const Image *image) { CacheView *cache_view; + ExceptionInfo + *exception; + MagickBooleanType status; - cache_view=AcquireVirtualCacheView(image,exception); + cache_view=AcquireVirtualCacheView(image); + exception=AcquireExceptionInfo(); status=SyncImagePixelCache(cache_view->image,exception); if (status == MagickFalse) { CatchException(exception); _exit(1); } + exception=DestroyExceptionInfo(exception); return(cache_view); } @@ -150,11 +153,8 @@ MagickExport CacheView *AcquireAuthenticCacheView(const Image *image, % % o image: the image. % -% o exception: return any errors or warnings in this structure. -% */ -MagickExport CacheView *AcquireVirtualCacheView(const Image *image, - ExceptionInfo *exception) +MagickExport CacheView *AcquireVirtualCacheView(const Image *image) { CacheView *cache_view; @@ -163,7 +163,6 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image, assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - (void) exception; cache_view=(CacheView *) MagickAssumeAligned(AcquireAlignedMemory(1, sizeof(*cache_view))); if (cache_view == (CacheView *) NULL) diff --git a/MagickCore/cache-view.h b/MagickCore/cache-view.h index b9e076e41..4eeab53b6 100644 --- a/MagickCore/cache-view.h +++ b/MagickCore/cache-view.h @@ -49,8 +49,8 @@ typedef struct _CacheView CacheView; extern MagickExport CacheView - *AcquireAuthenticCacheView(const Image *,ExceptionInfo *), - *AcquireVirtualCacheView(const Image *,ExceptionInfo *), + *AcquireAuthenticCacheView(const Image *), + *AcquireVirtualCacheView(const Image *), *CloneCacheView(const CacheView *), *DestroyCacheView(CacheView *); diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 98bb65d62..c01eca3dc 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -4909,7 +4909,7 @@ static MagickBooleanType SetCacheAlphaChannel(Image *image,const Quantum alpha, assert(cache_info->signature == MagickSignature); image->alpha_trait=BlendPixelTrait; status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); /* must be virtual */ + image_view=AcquireVirtualCacheView(image); /* must be virtual */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/channel.c b/MagickCore/channel.c index c3cb92158..6d5658af0 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -135,8 +135,8 @@ static MagickBooleanType ChannelImage(Image *destination_image, y; status=MagickTrue; - source_view=AcquireVirtualCacheView(source_image,exception); - destination_view=AcquireAuthenticCacheView(destination_image,exception); + source_view=AcquireVirtualCacheView(source_image); + destination_view=AcquireAuthenticCacheView(destination_image); height=MagickMin(source_image->rows,destination_image->rows); width=MagickMin(source_image->columns,destination_image->columns); #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -497,7 +497,7 @@ MagickExport Image *CombineImages(const Image *image, */ status=MagickTrue; progress=0; - combine_view=AcquireAuthenticCacheView(combine_image,exception); + combine_view=AcquireAuthenticCacheView(combine_image); for (y=0; y < (ssize_t) combine_image->rows; y++) { CacheView @@ -545,7 +545,7 @@ MagickExport Image *CombineImages(const Image *image, traits=GetPixelChannelTraits(combine_image,channel); if (traits == UndefinedPixelTrait) continue; - image_view=AcquireVirtualCacheView(next,exception); + image_view=AcquireVirtualCacheView(next); p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception); if (p == (const Quantum *) NULL) continue; @@ -657,8 +657,8 @@ MagickExport Image *SeparateImage(const Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - separate_view=AcquireAuthenticCacheView(separate_image,exception); + image_view=AcquireVirtualCacheView(image); + separate_view=AcquireAuthenticCacheView(separate_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c index 8a604256b..e5dd07798 100644 --- a/MagickCore/cipher.c +++ b/MagickCore/cipher.c @@ -661,7 +661,7 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image, } quantum_type=GetQuantumType(image,exception); pixels=GetQuantumPixels(quantum_info); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register ssize_t @@ -881,7 +881,7 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image, } quantum_type=GetQuantumType(image,exception); pixels=GetQuantumPixels(quantum_info); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register ssize_t diff --git a/MagickCore/color.c b/MagickCore/color.c index 432ad6d7a..443a9426f 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -1659,8 +1659,8 @@ MagickExport MagickBooleanType IsEquivalentImage(const Image *image, status=MagickTrue; GetPixelInfo(image,&pixel); GetPixelInfo(image,&target); - image_view=AcquireVirtualCacheView(image,exception); - target_view=AcquireVirtualCacheView(target_image,exception); + image_view=AcquireVirtualCacheView(image); + target_view=AcquireVirtualCacheView(target_image); for (y=(*y_offset); y < (ssize_t) image->rows; y++) { for (x=y == 0 ? *x_offset : 0; x < (ssize_t) image->columns; x++) diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index 90be84390..9e202cf7e 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -204,7 +204,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, if (image->storage_class == DirectClass) (void) SetImageType(image,PaletteType,exception); status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(NoBenefitFromParallelism) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -350,7 +350,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, for (i=0; i < (ssize_t) image->colors; i++) pixels[(ssize_t) image->colormap[i].alpha]=(unsigned short) i; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { Quantum diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 3b9d6a087..c2e319b84 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -262,7 +262,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -331,7 +331,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageColorspace(image,colorspace,exception) == MagickFalse) return(MagickFalse); GetPixelInfo(image,&zero); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -394,7 +394,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -456,7 +456,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -521,7 +521,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -586,7 +586,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -651,7 +651,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -716,7 +716,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -785,7 +785,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -860,7 +860,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -973,7 +973,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, logmap[i]=ScaleMapToQuantum((double) (MaxMap*(reference_white+ log10(black+(1.0*i/MaxMap)*(1.0-black))/((gamma/density)*0.002f/ film_gamma))/1024.0)); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1038,7 +1038,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1107,7 +1107,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1169,7 +1169,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1230,7 +1230,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1570,7 +1570,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, /* Convert DirectClass image. */ - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2227,7 +2227,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2295,7 +2295,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, return(MagickFalse); } GetPixelInfo(image,&zero); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2359,7 +2359,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, } if (SetImageColorspace(image,sRGBColorspace,exception) == MagickFalse) return(MagickFalse); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2416,7 +2416,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2481,7 +2481,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2546,7 +2546,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2611,7 +2611,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2676,7 +2676,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2745,7 +2745,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2818,7 +2818,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2933,7 +2933,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2998,7 +2998,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3067,7 +3067,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3128,7 +3128,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3457,7 +3457,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, /* Convert DirectClass image. */ - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 101251c52..816e76d97 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -174,9 +174,9 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, Generate difference image. */ status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); - highlight_view=AcquireAuthenticCacheView(highlight_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); + highlight_view=AcquireAuthenticCacheView(highlight_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -323,8 +323,8 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, Compute the absolute difference in pixels between two images. */ status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -448,8 +448,8 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, y; status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -549,8 +549,8 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, y; status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -657,8 +657,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image, area=0.0; maximum_error=0.0; mean_error=0.0; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -744,8 +744,8 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, y; status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -866,8 +866,8 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( for (i=0; i <= MaxPixelChannels; i++) distortion[i]=0.0; area=1.0/((double) image->columns*image->rows-1); - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -979,8 +979,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, y; status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1406,8 +1406,8 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image, maximum_error=0.0; mean_error_per_pixel=0.0; mean_error=0.0; - image_view=AcquireVirtualCacheView(image,exception); - reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); + image_view=AcquireVirtualCacheView(image); + reconstruct_view=AcquireVirtualCacheView(reconstruct_image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1590,7 +1590,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, */ status=MagickTrue; progress=0; - similarity_view=AcquireAuthenticCacheView(similarity_image,exception); + similarity_view=AcquireAuthenticCacheView(similarity_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 2b2ab3ca3..5d8099c7d 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -356,8 +356,8 @@ static MagickBooleanType CompositeOverImage(Image *image, */ status=MagickTrue; progress=0; - composite_view=AcquireVirtualCacheView(composite_image,exception); - image_view=AcquireAuthenticCacheView(image,exception); + composite_view=AcquireVirtualCacheView(composite_image); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -635,8 +635,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, if ((y_offset+(ssize_t) composite_image->rows) >= (ssize_t) image->rows) break; status=MagickTrue; - composite_view=AcquireVirtualCacheView(composite_image,exception); - image_view=AcquireAuthenticCacheView(image,exception); + composite_view=AcquireVirtualCacheView(composite_image); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -835,8 +835,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, /* do the variable blurring of each pixel in image */ GetPixelInfo(image,&pixel); - composite_view=AcquireVirtualCacheView(composite_image,exception); - destination_view=AcquireAuthenticCacheView(destination_image,exception); + composite_view=AcquireVirtualCacheView(composite_image); + destination_view=AcquireAuthenticCacheView(destination_image); for (y=0; y < (ssize_t) composite_image->rows; y++) { MagickBooleanType @@ -1020,9 +1020,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, displacement/distortion map. -- Like a lens... */ GetPixelInfo(image,&pixel); - image_view=AcquireVirtualCacheView(image,exception); - composite_view=AcquireVirtualCacheView(composite_image,exception); - destination_view=AcquireAuthenticCacheView(destination_image,exception); + image_view=AcquireVirtualCacheView(image); + composite_view=AcquireVirtualCacheView(composite_image); + destination_view=AcquireAuthenticCacheView(destination_image); for (y=0; y < (ssize_t) composite_image->rows; y++) { MagickBooleanType @@ -1204,8 +1204,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, status=MagickTrue; progress=0; midpoint=((MagickRealType) QuantumRange+1.0)/2; - composite_view=AcquireVirtualCacheView(composite_image,exception); - image_view=AcquireAuthenticCacheView(image,exception); + composite_view=AcquireVirtualCacheView(composite_image); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2459,8 +2459,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, Tile texture onto the image background (optimized). */ status=MagickTrue; - texture_view=AcquireVirtualCacheView(texture_image,exception); - image_view=AcquireAuthenticCacheView(image,exception); + texture_view=AcquireVirtualCacheView(texture_image); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(NoBenefitFromParallelism) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/compress.c b/MagickCore/compress.c index b33d14825..93e1419b8 100644 --- a/MagickCore/compress.c +++ b/MagickCore/compress.c @@ -500,7 +500,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image, image->resolution.x=204.0; image->resolution.y=196.0; image->units=PixelsPerInchResolution; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; ((y < (ssize_t) image->rows) && (null_lines < 3)); ) { register Quantum diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index af3178444..0cb9a5fc9 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -281,8 +281,8 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, trough.alpha=matte.alpha; status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - frame_view=AcquireAuthenticCacheView(frame_image,exception); + image_view=AcquireVirtualCacheView(image); + frame_view=AcquireAuthenticCacheView(frame_image); height=(size_t) (frame_info->outer_bevel+(frame_info->y-bevel_width)+ frame_info->inner_bevel); if (height != 0) @@ -687,7 +687,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(NoBenefitFromParallelism) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/display.c b/MagickCore/display.c index bc26228bf..8712d6a6e 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -3734,7 +3734,7 @@ static MagickBooleanType XColorEditImage(Display *display, if ((x_offset >= (int) (*image)->columns) || (y_offset >= (int) (*image)->rows)) continue; - image_view=AcquireAuthenticCacheView(*image,exception); + image_view=AcquireAuthenticCacheView(*image); switch (method) { case PointMethod: @@ -4336,7 +4336,7 @@ static MagickBooleanType XCompositeImage(Display *display, if( IfMagickFalse(SetImageStorageClass(image,DirectClass,exception)) ) return(MagickFalse); image->alpha_trait=BlendPixelTrait; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (int) image->rows; y++) { q=GetCacheViewAuthenticPixels(image_view,0,(ssize_t) y,image->columns,1, @@ -5357,7 +5357,7 @@ static MagickBooleanType XCropImage(Display *display, if( IfMagickFalse(SetImageStorageClass(image,DirectClass,exception)) ) return(MagickFalse); image->alpha_trait=BlendPixelTrait; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (int) crop_info.height; y++) { q=GetCacheViewAuthenticPixels(image_view,crop_info.x,y+crop_info.y, @@ -10095,7 +10095,7 @@ static MagickBooleanType XMatteEditImage(Display *display, return(MagickFalse); if ((*image)->alpha_trait != BlendPixelTrait) (void) SetImageAlphaChannel(*image,OpaqueAlphaChannel,exception); - image_view=AcquireAuthenticCacheView(*image,exception); + image_view=AcquireAuthenticCacheView(*image); switch (method) { case PointMethod: @@ -13267,7 +13267,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, */ x_offset=(int) (width*(tile % (((int) image->columns-x)/width))+x); y_offset=(int) (height*(tile/(((int) image->columns-x)/width))+y); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); (void) GetOneCacheViewVirtualPixelInfo(image_view,0,0,&pixel,exception); for (i=0; i < (int) height; i++) { diff --git a/MagickCore/distort.c b/MagickCore/distort.c index c481db935..ec1b9a8a6 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2314,7 +2314,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, GetPixelInfo(distort_image,&zero); resample_filter=AcquireResampleFilterThreadSet(image, UndefinedVirtualPixelMethod,MagickFalse,exception); - distort_view=AcquireAuthenticCacheView(distort_image,exception); + distort_view=AcquireAuthenticCacheView(distort_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3037,7 +3037,7 @@ MagickExport Image *SparseColorImage(const Image *image, status=MagickTrue; progress=0; - sparse_view=AcquireAuthenticCacheView(sparse_image,exception); + sparse_view=AcquireAuthenticCacheView(sparse_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/draw.c b/MagickCore/draw.c index fdfcb5d0a..29bb8c11e 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1171,8 +1171,8 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, height=(size_t) (floor(edge.y2+0.5)-ceil(edge.y1-0.5)); width=(size_t) (floor(edge.x2+0.5)-ceil(edge.x1-0.5)); #endif - source_view=AcquireVirtualCacheView(source,exception); - image_view=AcquireAuthenticCacheView(image,exception); + source_view=AcquireVirtualCacheView(source); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,width,height,1) @@ -3266,7 +3266,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, height=bounding_box.height-bounding_box.y; width=bounding_box.width-bounding_box.x; #endif - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,width,height,1) @@ -3872,7 +3872,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, bounds.y2=bounds.y2 < 0.0 ? 0.0 : (size_t) floor(bounds.y2+0.5) >= image->rows ? (double) image->rows-1 : bounds.y2; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) height=(size_t) (floor(bounds.y2+0.5)-ceil(bounds.y1-0.5)); width=(size_t) (floor(bounds.x2+0.5)-ceil(bounds.x1-0.5)); @@ -4182,7 +4182,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, status=MagickTrue; x=(ssize_t) ceil(primitive_info->point.x-0.5); y=(ssize_t) ceil(primitive_info->point.y-0.5); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); switch (primitive_info->primitive) { case PointPrimitive: diff --git a/MagickCore/effect.c b/MagickCore/effect.c index d873bc835..d3eb9273e 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -295,9 +295,9 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - edge_view=AcquireVirtualCacheView(edge_image,exception); - blur_view=AcquireAuthenticCacheView(blur_image,exception); + image_view=AcquireVirtualCacheView(image); + edge_view=AcquireVirtualCacheView(edge_image); + blur_view=AcquireAuthenticCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -620,9 +620,9 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - edge_view=AcquireVirtualCacheView(edge_image,exception); - sharp_view=AcquireAuthenticCacheView(sharp_image,exception); + image_view=AcquireVirtualCacheView(image); + edge_view=AcquireVirtualCacheView(edge_image); + sharp_view=AcquireAuthenticCacheView(sharp_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -949,8 +949,8 @@ MagickExport Image *BlurImage(const Image *image,const double radius, status=MagickTrue; progress=0; center=(ssize_t) GetPixelChannels(image)*(width/2L); - image_view=AcquireVirtualCacheView(image,exception); - blur_view=AcquireAuthenticCacheView(blur_image,exception); + image_view=AcquireVirtualCacheView(image); + blur_view=AcquireAuthenticCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1074,8 +1074,8 @@ MagickExport Image *BlurImage(const Image *image,const double radius, Blur columns. */ center=(ssize_t) GetPixelChannels(blur_image)*(width/2L); - image_view=AcquireVirtualCacheView(blur_image,exception); - blur_view=AcquireAuthenticCacheView(blur_image,exception); + image_view=AcquireVirtualCacheView(blur_image); + blur_view=AcquireAuthenticCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1421,8 +1421,8 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) Reduce speckle in the image. */ status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); - despeckle_view=AcquireAuthenticCacheView(despeckle_image,exception); + image_view=AcquireVirtualCacheView(image); + despeckle_view=AcquireAuthenticCacheView(despeckle_image); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel @@ -1947,9 +1947,9 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - motion_view=AcquireVirtualCacheView(image,exception); - blur_view=AcquireAuthenticCacheView(blur_image,exception); + image_view=AcquireVirtualCacheView(image); + motion_view=AcquireVirtualCacheView(image); + blur_view=AcquireAuthenticCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2723,9 +2723,9 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - radial_view=AcquireVirtualCacheView(image,exception); - blur_view=AcquireAuthenticCacheView(blur_image,exception); + image_view=AcquireVirtualCacheView(image); + radial_view=AcquireVirtualCacheView(image); + blur_view=AcquireAuthenticCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3033,9 +3033,9 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, progress=0; center=(ssize_t) (GetPixelChannels(image)*(image->columns+width)*(width/2L)+ GetPixelChannels(image)*(width/2L)); - image_view=AcquireVirtualCacheView(image,exception); - luminance_view=AcquireVirtualCacheView(luminance_image,exception); - blur_view=AcquireAuthenticCacheView(blur_image,exception); + image_view=AcquireVirtualCacheView(image); + luminance_view=AcquireVirtualCacheView(luminance_image); + blur_view=AcquireAuthenticCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3299,8 +3299,8 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - shade_view=AcquireAuthenticCacheView(shade_image,exception); + image_view=AcquireVirtualCacheView(image); + shade_view=AcquireAuthenticCacheView(shade_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3625,8 +3625,8 @@ MagickExport Image *SpreadImage(const Image *image,const double radius, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #endif - image_view=AcquireVirtualCacheView(image,exception); - spread_view=AcquireAuthenticCacheView(spread_image,exception); + image_view=AcquireVirtualCacheView(image); + spread_view=AcquireAuthenticCacheView(spread_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,key == ~0UL) @@ -3765,8 +3765,8 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - unsharp_view=AcquireAuthenticCacheView(unsharp_image,exception); + image_view=AcquireVirtualCacheView(image); + unsharp_view=AcquireAuthenticCacheView(unsharp_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 4bacebe1e..00dada13d 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -342,7 +342,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, status=MagickTrue; progress=0; adjust=(ssize_t) (clut_image->interpolate == IntegerInterpolatePixel ? 0 : 1); - clut_view=AcquireVirtualCacheView(clut_image,exception); + clut_view=AcquireVirtualCacheView(clut_image); for (i=0; i <= (ssize_t) MaxMap; i++) { GetPixelInfo(clut_image,clut_map+i); @@ -351,7 +351,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, (clut_image->rows-adjust),clut_map+i,exception); } clut_view=DestroyCacheView(clut_view); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -737,7 +737,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -902,7 +902,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1058,7 +1058,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, status=MagickTrue; (void) ResetMagickMemory(histogram,0,(MaxMap+1)*GetPixelChannels(image)* sizeof(*histogram)); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1198,7 +1198,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1348,8 +1348,8 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - enhance_view=AcquireAuthenticCacheView(enhance_image,exception); + image_view=AcquireVirtualCacheView(image); + enhance_view=AcquireAuthenticCacheView(enhance_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1550,7 +1550,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, status=MagickTrue; (void) ResetMagickMemory(histogram,0,(MaxMap+1)*GetPixelChannels(image)* sizeof(*histogram)); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1666,7 +1666,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, Equalize image. */ progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1833,7 +1833,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2002,8 +2002,8 @@ MagickExport MagickBooleanType HaldClutImage(Image *image, cube_size=level*level; width=(double) hald_image->columns; GetPixelInfo(hald_image,&zero); - hald_view=AcquireVirtualCacheView(hald_image,exception); - image_view=AcquireAuthenticCacheView(image,exception); + hald_view=AcquireVirtualCacheView(hald_image); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2208,7 +2208,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2373,7 +2373,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2646,7 +2646,7 @@ MagickExport MagickBooleanType LinearStretchImage(Image *image, Form histogram. */ (void) ResetMagickMemory(histogram,0,(MaxMap+1)*sizeof(*histogram)); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -2924,7 +2924,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3081,7 +3081,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); if (grayscale != MagickFalse) { for (y=0; y < (ssize_t) image->rows; y++) @@ -3455,7 +3455,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/feature.c b/MagickCore/feature.c index 8368b5fca..fc8df1a2b 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -221,7 +221,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, grays[i].black=(~0U); } status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -396,7 +396,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, Initialize spatial dependence matrix. */ status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c index 6d068cd02..a6497c9c9 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -290,7 +290,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info, i++; } } - magnitude_view=AcquireAuthenticCacheView(magnitude_image,exception); + magnitude_view=AcquireAuthenticCacheView(magnitude_image); i=0L; for (y=0L; y < (ssize_t) fourier_info->height; y++) { @@ -343,7 +343,7 @@ static MagickBooleanType ForwardFourier(const FourierInfo *fourier_info, } magnitude_view=DestroyCacheView(magnitude_view); i=0L; - phase_view=AcquireAuthenticCacheView(phase_image,exception); + phase_view=AcquireAuthenticCacheView(phase_image); for (y=0L; y < (ssize_t) fourier_info->height; y++) { q=GetCacheViewAuthenticPixels(phase_view,0L,y,fourier_info->height,1UL, @@ -439,7 +439,7 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info, ResetMagickMemory(source,0,fourier_info->height*fourier_info->width* sizeof(*source)); i=0L; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0L; y < (ssize_t) fourier_info->height; y++) { p=GetCacheViewVirtualPixels(image_view,0L,y,fourier_info->width,1UL, @@ -855,7 +855,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info, return(MagickFalse); } i=0L; - magnitude_view=AcquireVirtualCacheView(magnitude_image,exception); + magnitude_view=AcquireVirtualCacheView(magnitude_image); for (y=0L; y < (ssize_t) fourier_info->height; y++) { p=GetCacheViewVirtualPixels(magnitude_view,0L,y,fourier_info->width,1UL, @@ -898,7 +898,7 @@ static MagickBooleanType InverseFourier(FourierInfo *fourier_info, } } i=0L; - phase_view=AcquireVirtualCacheView(phase_image,exception); + phase_view=AcquireVirtualCacheView(phase_image); for (y=0L; y < (ssize_t) fourier_info->height; y++) { p=GetCacheViewVirtualPixels(phase_view,0,y,fourier_info->width,1, @@ -1055,7 +1055,7 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info, fftw_destroy_plan(fftw_c2r_plan); } i=0L; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0L; y < (ssize_t) fourier_info->height; y++) { if (y >= (ssize_t) image->rows) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 2f816cfde..c0841ad6a 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -189,7 +189,7 @@ MagickPrivate FxInfo *AcquireFxInfo(const Image *image,const char *expression, next=GetFirstImageInList(fx_info->images); for ( ; next != (Image *) NULL; next=next->next) { - fx_info->view[i]=AcquireVirtualCacheView(next,exception); + fx_info->view[i]=AcquireVirtualCacheView(next); i++; } fx_info->random_info=AcquireRandomInfo(); @@ -313,8 +313,8 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, status=MagickTrue; progress=0; random_info=AcquireRandomInfoThreadSet(); - image_view=AcquireVirtualCacheView(image,exception); - noise_view=AcquireAuthenticCacheView(noise_image,exception); + image_view=AcquireVirtualCacheView(image); + noise_view=AcquireAuthenticCacheView(noise_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ @@ -476,8 +476,8 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - shift_view=AcquireAuthenticCacheView(shift_image,exception); + image_view=AcquireVirtualCacheView(image); + shift_view=AcquireAuthenticCacheView(shift_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -739,8 +739,8 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - colorize_view=AcquireAuthenticCacheView(colorize_image,exception); + image_view=AcquireVirtualCacheView(image); + colorize_view=AcquireAuthenticCacheView(colorize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -957,8 +957,8 @@ MagickExport Image *ColorMatrixImage(const Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - color_view=AcquireAuthenticCacheView(color_image,exception); + image_view=AcquireVirtualCacheView(image); + color_view=AcquireAuthenticCacheView(color_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3069,8 +3069,8 @@ MagickExport Image *FxImage(const Image *image,const char *expression, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - fx_view=AcquireAuthenticCacheView(fx_image,exception); + image_view=AcquireVirtualCacheView(image); + fx_view=AcquireAuthenticCacheView(fx_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3263,8 +3263,8 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - implode_view=AcquireAuthenticCacheView(implode_image,exception); + image_view=AcquireVirtualCacheView(image); + implode_view=AcquireAuthenticCacheView(implode_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3508,8 +3508,8 @@ MagickExport Image *MorphImages(const Image *image, morph_images=DestroyImageList(morph_images); return((Image *) NULL); } - image_view=AcquireVirtualCacheView(morph_image,exception); - morph_view=AcquireAuthenticCacheView(morph_images,exception); + image_view=AcquireVirtualCacheView(morph_image); + morph_view=AcquireAuthenticCacheView(morph_images); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3886,9 +3886,9 @@ MagickExport MagickBooleanType PlasmaImage(Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); - image_view=AcquireAuthenticCacheView(image,exception); - u_view=AcquireVirtualCacheView(image,exception); - v_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); + u_view=AcquireVirtualCacheView(image); + v_view=AcquireVirtualCacheView(image); random_info=AcquireRandomInfo(); status=PlasmaImageProxy(image,image_view,u_view,v_view,random_info,segment, attenuate,depth,exception); @@ -4159,8 +4159,8 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - sepia_view=AcquireAuthenticCacheView(sepia_image,exception); + image_view=AcquireVirtualCacheView(image); + sepia_view=AcquireAuthenticCacheView(sepia_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -4324,7 +4324,7 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha, Shadow image. */ status=MagickTrue; - image_view=AcquireAuthenticCacheView(border_image,exception); + image_view=AcquireAuthenticCacheView(border_image); for (y=0; y < (ssize_t) border_image->rows; y++) { PixelInfo @@ -4455,7 +4455,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #endif - random_view=AcquireAuthenticCacheView(random_image,exception); + random_view=AcquireAuthenticCacheView(random_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,key == ~0UL) @@ -4629,7 +4629,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -4796,8 +4796,8 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, depth=stegano_image->depth; k=stegano_image->offset; status=MagickTrue; - watermark_view=AcquireVirtualCacheView(watermark,exception); - stegano_view=AcquireAuthenticCacheView(stegano_image,exception); + watermark_view=AcquireVirtualCacheView(watermark); + stegano_view=AcquireAuthenticCacheView(stegano_image); for (i=(ssize_t) depth-1; (i >= 0) && (j < (ssize_t) depth); i--) { for (y=0; (y < (ssize_t) watermark->rows) && (j < (ssize_t) depth); y++) @@ -5114,8 +5114,8 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - swirl_view=AcquireAuthenticCacheView(swirl_image,exception); + image_view=AcquireVirtualCacheView(image); + swirl_view=AcquireAuthenticCacheView(swirl_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -5351,8 +5351,8 @@ MagickExport Image *TintImage(const Image *image,const char *blend, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - tint_view=AcquireAuthenticCacheView(tint_image,exception); + image_view=AcquireVirtualCacheView(image); + tint_view=AcquireAuthenticCacheView(tint_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -5650,8 +5650,8 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - wave_view=AcquireAuthenticCacheView(wave_image,exception); + image_view=AcquireVirtualCacheView(image); + wave_view=AcquireAuthenticCacheView(wave_image); (void) SetCacheViewVirtualPixelMethod(image_view, BackgroundVirtualPixelMethod); #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index f244bcccd..7a1417c10 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -224,7 +224,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, } GetPixelInfo(image,&pixel); GetPixelInfo(image,&target); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -686,7 +686,7 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, } GetPixelInfo(image,&pixel); GetPixelInfo(image,&target); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -846,7 +846,7 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, } GetPixelInfo(image,&pixel); GetPixelInfo(image,&target); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -1292,7 +1292,7 @@ MagickExport Image *UniqueImageColors(const Image *image, unique_image=DestroyImage(unique_image); return((Image *) NULL); } - unique_view=AcquireAuthenticCacheView(unique_image,exception); + unique_view=AcquireAuthenticCacheView(unique_image); UniqueColorsToImage(unique_image,unique_view,cube_info,cube_info->root, exception); unique_view=DestroyCacheView(unique_view); diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c index 29353fc1c..8a58cb3a5 100644 --- a/MagickCore/image-view.c +++ b/MagickCore/image-view.c @@ -730,7 +730,7 @@ MagickExport ImageView *NewImageView(Image *image,ExceptionInfo *exception) (void) ResetMagickMemory(image_view,0,sizeof(*image_view)); image_view->description=ConstantString("ImageView"); image_view->image=image; - image_view->view=AcquireVirtualCacheView(image_view->image,exception); + image_view->view=AcquireVirtualCacheView(image_view->image); image_view->extent.width=image->columns; image_view->extent.height=image->rows; image_view->extent.x=0; @@ -785,7 +785,7 @@ MagickExport ImageView *NewImageViewRegion(Image *image,const ssize_t x, ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); (void) ResetMagickMemory(image_view,0,sizeof(*image_view)); image_view->description=ConstantString("ImageView"); - image_view->view=AcquireVirtualCacheView(image_view->image,exception); + image_view->view=AcquireVirtualCacheView(image_view->image); image_view->image=image; image_view->extent.width=width; image_view->extent.height=height; diff --git a/MagickCore/image.c b/MagickCore/image.c index f5d0c2e70..e0dfb1936 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -519,7 +519,7 @@ MagickExport Image *AppendImages(const Image *images, x_offset=0; y_offset=0; next=images; - append_view=AcquireAuthenticCacheView(append_image,exception); + append_view=AcquireAuthenticCacheView(append_image); for (n=0; n < (MagickOffsetType) number_images; n++) { CacheView @@ -538,7 +538,7 @@ MagickExport Image *AppendImages(const Image *images, x_offset-=geometry.x; else y_offset-=geometry.y; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1310,8 +1310,8 @@ MagickExport Image *GetImageMask(const Image *image,ExceptionInfo *exception) status=MagickTrue; (void) SetImageColorspace(mask_image,GRAYColorspace,exception); mask_image->mask=MagickFalse; - image_view=AcquireVirtualCacheView(image,exception); - mask_view=AcquireAuthenticCacheView(mask_image,exception); + image_view=AcquireVirtualCacheView(image); + mask_view=AcquireAuthenticCacheView(mask_image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1648,7 +1648,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1903,7 +1903,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info, image->fuzz=background->fuzz; image->depth=background->depth; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2175,7 +2175,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, break; if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) break; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2254,7 +2254,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, break; if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) break; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2364,7 +2364,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image, Set image background color. */ status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register Quantum @@ -2480,7 +2480,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image, image->fuzz=color->fuzz; image->depth=color->depth; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3054,8 +3054,8 @@ MagickExport MagickBooleanType SetImageMask(Image *image,const Image *mask, } status=MagickTrue; image->mask=MagickTrue; - mask_view=AcquireVirtualCacheView(mask,exception); - image_view=AcquireAuthenticCacheView(image,exception); + mask_view=AcquireVirtualCacheView(mask); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -3134,7 +3134,7 @@ MagickExport MagickBooleanType SetImageAlpha(Image *image,const Quantum alpha, assert(image->signature == MagickSignature); image->alpha_trait=BlendPixelTrait; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3280,8 +3280,8 @@ static ssize_t SmushXGap(const Image *smush_image,const Image *images, GravityAdjustGeometry(left_image->columns,left_image->rows, left_image->gravity,&left_geometry); gap=right_image->columns; - left_view=AcquireVirtualCacheView(left_image,exception); - right_view=AcquireVirtualCacheView(right_image,exception); + left_view=AcquireVirtualCacheView(left_image); + right_view=AcquireVirtualCacheView(right_image); for (y=0; y < (ssize_t) smush_image->rows; y++) { for (x=(ssize_t) left_image->columns-1; x > 0; x--) @@ -3351,8 +3351,8 @@ static ssize_t SmushYGap(const Image *smush_image,const Image *images, GravityAdjustGeometry(top_image->columns,top_image->rows,top_image->gravity, &top_geometry); gap=bottom_image->rows; - top_view=AcquireVirtualCacheView(top_image,exception); - bottom_view=AcquireVirtualCacheView(bottom_image,exception); + top_view=AcquireVirtualCacheView(top_image); + bottom_view=AcquireVirtualCacheView(bottom_image); for (x=0; x < (ssize_t) smush_image->columns; x++) { for (y=(ssize_t) top_image->rows-1; y > 0; y--) @@ -3606,7 +3606,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) return(MagickFalse); range_exception=MagickFalse; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(range_exception,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index c076c1d9c..632699a35 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -15,9 +15,7 @@ /* #undef BUILD_MODULES */ /* Define if you have the bzip2 library */ -#ifndef MAGICKCORE_BZLIB_DELEGATE -#define MAGICKCORE_BZLIB_DELEGATE 1 -#endif +/* #undef BZLIB_DELEGATE */ /* Define if you have CAIRO library */ /* #undef CAIRO_DELEGATE */ @@ -47,9 +45,7 @@ #endif /* Define if you have DJVU library */ -#ifndef MAGICKCORE_DJVU_DELEGATE -#define MAGICKCORE_DJVU_DELEGATE 1 -#endif +/* #undef DJVU_DELEGATE */ /* Directory where ImageMagick documents live. */ #ifndef MAGICKCORE_DOCUMENTATION_PATH @@ -68,9 +64,7 @@ #endif /* Define if you have FFTW library */ -#ifndef MAGICKCORE_FFTW_DELEGATE -#define MAGICKCORE_FFTW_DELEGATE 1 -#endif +/* #undef FFTW_DELEGATE */ /* filter subdirectory. */ #ifndef MAGICKCORE_FILTER_DIRNAME @@ -78,17 +72,13 @@ #endif /* Define if you have FONTCONFIG library */ -#ifndef MAGICKCORE_FONTCONFIG_DELEGATE -#define MAGICKCORE_FONTCONFIG_DELEGATE 1 -#endif +/* #undef FONTCONFIG_DELEGATE */ /* Define if you have FlashPIX library */ /* #undef FPX_DELEGATE */ /* Define if you have FreeType (TrueType font) library */ -#ifndef MAGICKCORE_FREETYPE_DELEGATE -#define MAGICKCORE_FREETYPE_DELEGATE 1 -#endif +/* #undef FREETYPE_DELEGATE */ /* Define if you have Ghostscript library or framework */ /* #undef GS_DELEGATE */ @@ -274,9 +264,7 @@ #endif /* Define to 1 if you have the header file. */ -#ifndef MAGICKCORE_HAVE_FT2BUILD_H -#define MAGICKCORE_HAVE_FT2BUILD_H 1 -#endif +/* #undef HAVE_FT2BUILD_H */ /* Define to 1 if you have the `ftime' function. */ #ifndef MAGICKCORE_HAVE_FTIME @@ -367,9 +355,7 @@ #endif /* Define if you have the header file. */ -#ifndef MAGICKCORE_HAVE_LCMS2_H -#define MAGICKCORE_HAVE_LCMS2_H 1 -#endif +/* #undef HAVE_LCMS2_H */ /* Define if you have the header file. */ /* #undef HAVE_LCMS2_LCMS2_H */ @@ -621,14 +607,10 @@ #endif /* X11 server supports shape extension */ -#ifndef MAGICKCORE_HAVE_SHAPE -#define MAGICKCORE_HAVE_SHAPE 1 -#endif +/* #undef HAVE_SHAPE */ /* X11 server supports shared memory extension */ -#ifndef MAGICKCORE_HAVE_SHARED_MEMORY -#define MAGICKCORE_HAVE_SHARED_MEMORY 1 -#endif +/* #undef HAVE_SHARED_MEMORY */ /* Define to 1 if you have the `sigaction' function. */ #ifndef MAGICKCORE_HAVE_SIGACTION @@ -874,49 +856,31 @@ #endif /* Define to 1 if you have the header file. */ -#ifndef MAGICKCORE_HAVE_TIFFCONF_H -#define MAGICKCORE_HAVE_TIFFCONF_H 1 -#endif +/* #undef HAVE_TIFFCONF_H */ /* Define to 1 if you have the `TIFFIsBigEndian' function. */ -#ifndef MAGICKCORE_HAVE_TIFFISBIGENDIAN -#define MAGICKCORE_HAVE_TIFFISBIGENDIAN 1 -#endif +/* #undef HAVE_TIFFISBIGENDIAN */ /* Define to 1 if you have the `TIFFIsCODECConfigured' function. */ -#ifndef MAGICKCORE_HAVE_TIFFISCODECCONFIGURED -#define MAGICKCORE_HAVE_TIFFISCODECCONFIGURED 1 -#endif +/* #undef HAVE_TIFFISCODECCONFIGURED */ /* Define to 1 if you have the `TIFFMergeFieldInfo' function. */ -#ifndef MAGICKCORE_HAVE_TIFFMERGEFIELDINFO -#define MAGICKCORE_HAVE_TIFFMERGEFIELDINFO 1 -#endif +/* #undef HAVE_TIFFMERGEFIELDINFO */ /* Define to 1 if you have the `TIFFReadEXIFDirectory' function. */ -#ifndef MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY -#define MAGICKCORE_HAVE_TIFFREADEXIFDIRECTORY 1 -#endif +/* #undef HAVE_TIFFREADEXIFDIRECTORY */ /* Define to 1 if you have the `TIFFSetErrorHandlerExt' function. */ -#ifndef MAGICKCORE_HAVE_TIFFSETERRORHANDLEREXT -#define MAGICKCORE_HAVE_TIFFSETERRORHANDLEREXT 1 -#endif +/* #undef HAVE_TIFFSETERRORHANDLEREXT */ /* Define to 1 if you have the `TIFFSetTagExtender' function. */ -#ifndef MAGICKCORE_HAVE_TIFFSETTAGEXTENDER -#define MAGICKCORE_HAVE_TIFFSETTAGEXTENDER 1 -#endif +/* #undef HAVE_TIFFSETTAGEXTENDER */ /* Define to 1 if you have the `TIFFSetWarningHandlerExt' function. */ -#ifndef MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT -#define MAGICKCORE_HAVE_TIFFSETWARNINGHANDLEREXT 1 -#endif +/* #undef HAVE_TIFFSETWARNINGHANDLEREXT */ /* Define to 1 if you have the `TIFFSwabArrayOfTriples' function. */ -#ifndef MAGICKCORE_HAVE_TIFFSWABARRAYOFTRIPLES -#define MAGICKCORE_HAVE_TIFFSWABARRAYOFTRIPLES 1 -#endif +/* #undef HAVE_TIFFSWABARRAYOFTRIPLES */ /* Define to 1 if you have the `times' function. */ #ifndef MAGICKCORE_HAVE_TIMES @@ -1085,24 +1049,16 @@ #endif /* Define if you have JBIG library */ -#ifndef MAGICKCORE_JBIG_DELEGATE -#define MAGICKCORE_JBIG_DELEGATE 1 -#endif +/* #undef JBIG_DELEGATE */ /* Define if you have JPEG version 2 "Jasper" library */ -#ifndef MAGICKCORE_JP2_DELEGATE -#define MAGICKCORE_JP2_DELEGATE 1 -#endif +/* #undef JP2_DELEGATE */ /* Define if you have JPEG library */ -#ifndef MAGICKCORE_JPEG_DELEGATE -#define MAGICKCORE_JPEG_DELEGATE 1 -#endif +/* #undef JPEG_DELEGATE */ /* Define if you have LCMS (v1.11 or later) library */ -#ifndef MAGICKCORE_LCMS_DELEGATE -#define MAGICKCORE_LCMS_DELEGATE 1 -#endif +/* #undef LCMS_DELEGATE */ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH @@ -1116,9 +1072,7 @@ #endif /* Define if you have LQR library */ -#ifndef MAGICKCORE_LQR_DELEGATE -#define MAGICKCORE_LQR_DELEGATE 1 -#endif +/* #undef LQR_DELEGATE */ /* Define if using libltdl to support dynamically loadable modules */ /* #undef LTDL_DELEGATE */ @@ -1130,9 +1084,7 @@ #endif /* Define if you have LZMA library */ -#ifndef MAGICKCORE_LZMA_DELEGATE -#define MAGICKCORE_LZMA_DELEGATE 1 -#endif +/* #undef LZMA_DELEGATE */ /* Define to prepend to default font search path. */ /* #undef MAGICK_FONT_PATH */ @@ -1170,9 +1122,7 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -#ifndef MAGICKCORE_OPENEXR_DELEGATE -#define MAGICKCORE_OPENEXR_DELEGATE 1 -#endif +/* #undef OPENEXR_DELEGATE */ /* Name of package */ #ifndef MAGICKCORE_PACKAGE @@ -1210,19 +1160,13 @@ #endif /* Define if you have PANGOCAIRO library */ -#ifndef MAGICKCORE_PANGOCAIRO_DELEGATE -#define MAGICKCORE_PANGOCAIRO_DELEGATE 1 -#endif +/* #undef PANGOCAIRO_DELEGATE */ /* Define if you have PANGO library */ -#ifndef MAGICKCORE_PANGO_DELEGATE -#define MAGICKCORE_PANGO_DELEGATE 1 -#endif +/* #undef PANGO_DELEGATE */ /* Define if you have PNG library */ -#ifndef MAGICKCORE_PNG_DELEGATE -#define MAGICKCORE_PNG_DELEGATE 1 -#endif +/* #undef PNG_DELEGATE */ /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -1382,9 +1326,7 @@ #endif /* Define if you have TIFF library */ -#ifndef MAGICKCORE_TIFF_DELEGATE -#define MAGICKCORE_TIFF_DELEGATE 1 -#endif +/* #undef TIFF_DELEGATE */ /* Define to 1 if you can safely include both and . */ #ifndef MAGICKCORE_TIME_WITH_SYS_TIME @@ -1454,25 +1396,21 @@ #endif /* Define if you have X11 library */ -#ifndef MAGICKCORE_X11_DELEGATE -#define MAGICKCORE_X11_DELEGATE 1 -#endif +/* #undef X11_DELEGATE */ /* Define if you have XML library */ -#ifndef MAGICKCORE_XML_DELEGATE -#define MAGICKCORE_XML_DELEGATE 1 -#endif +/* #undef XML_DELEGATE */ /* Define to 1 if the X Window System is missing or not being used. */ -/* #undef X_DISPLAY_MISSING */ +#ifndef MAGICKCORE_X_DISPLAY_MISSING +#define MAGICKCORE_X_DISPLAY_MISSING 1 +#endif /* Build self-contained, embeddable, zero-configuration ImageMagick */ /* #undef ZERO_CONFIGURATION_SUPPORT */ /* Define if you have zlib compression library */ -#ifndef MAGICKCORE_ZLIB_DELEGATE -#define MAGICKCORE_ZLIB_DELEGATE 1 -#endif +/* #undef ZLIB_DELEGATE */ /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 32e39ae5d..b92e3af07 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2606,8 +2606,8 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, changed=0; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - morphology_view=AcquireAuthenticCacheView(morphology_image,exception); + image_view=AcquireVirtualCacheView(image); + morphology_view=AcquireAuthenticCacheView(morphology_image); virt_width=image->columns+kernel->width-1; /* Some methods (including convolve) needs use a reflected kernel. @@ -3440,8 +3440,8 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, /* DO NOT THREAD THIS CODE! */ /* two views into same image (virtual, and actual) */ - virt_view=AcquireVirtualCacheView(image,exception); - auth_view=AcquireAuthenticCacheView(image,exception); + virt_view=AcquireVirtualCacheView(image); + auth_view=AcquireAuthenticCacheView(image); virt_width=image->columns+kernel->width-1; for (y=0; y < (ssize_t) image->rows; y++) diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 22697b89b..3e2476d3e 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -207,8 +207,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, PushSegmentStack(y,x,x,1); PushSegmentStack(y+1,x,x,-1); GetPixelInfo(image,&pixel); - image_view=AcquireVirtualCacheView(image,exception); - floodplane_view=AcquireAuthenticCacheView(floodplane_image,exception); + image_view=AcquireVirtualCacheView(image); + floodplane_view=AcquireAuthenticCacheView(floodplane_image); while (s > segment_stack) { register const Quantum @@ -587,8 +587,8 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, progress=0; center=(ssize_t) GetPixelChannels(image)*(image->columns+width)*(width/2L)+ GetPixelChannels(image)*(width/2L); - image_view=AcquireVirtualCacheView(image,exception); - paint_view=AcquireAuthenticCacheView(paint_image,exception); + image_view=AcquireVirtualCacheView(image); + paint_view=AcquireAuthenticCacheView(paint_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -784,7 +784,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, status=MagickTrue; progress=0; GetPixelInfo(image,&zero); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -911,7 +911,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, status=MagickTrue; progress=0; GetPixelInfo(image,&zero); - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1038,7 +1038,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 8a7624e0e..caef3d14b 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4308,7 +4308,7 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image, excerpt_image=DestroyImage(excerpt_image); if (filter_image == (Image *) NULL) break; - filter_view=AcquireVirtualCacheView(filter_image,exception); + filter_view=AcquireVirtualCacheView(filter_image); p=GetCacheViewVirtualPixels(filter_view,0,0,1,1,exception); if (p == (const Quantum *) NULL) status=MagickFalse; @@ -4847,7 +4847,7 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, excerpt_source=DestroyImage(excerpt_source); if (filter_source == (Image *) NULL) continue; - filter_view=AcquireVirtualCacheView(filter_source,exception); + filter_view=AcquireVirtualCacheView(filter_source); p=GetCacheViewVirtualPixels(filter_view,0,0,1,1,exception); if (p == (const Quantum *) NULL) status=MagickFalse; @@ -5404,7 +5404,7 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image, excerpt_image=DestroyImage(excerpt_image); if (filter_image == (Image *) NULL) break; - filter_view=AcquireVirtualCacheView(filter_image,exception); + filter_view=AcquireVirtualCacheView(filter_image); p=GetCacheViewVirtualPixels(filter_view,0,0,1,1,exception); if (p != (const Quantum *) NULL) GetPixelInfoPixel(image,p,pixel); diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c index db031cf59..a4a73a6f7 100644 --- a/MagickCore/prepress.c +++ b/MagickCore/prepress.c @@ -110,7 +110,7 @@ MagickExport double GetImageTotalInkDensity(Image *image, } status=MagickTrue; total_ink_density=0.0; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/profile.c b/MagickCore/profile.c index fbd7301c5..87ec0c6b6 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -857,7 +857,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, (void) SetImageColorspace(image,target_colorspace,exception); status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index 6503d46bd..1c35b0b92 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -540,7 +540,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, status; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -809,7 +809,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, midpoint.blue=(double) QuantumRange/2.0; midpoint.alpha=(double) QuantumRange/2.0; error.alpha=0.0; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1496,7 +1496,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, if (pixels == (RealPixelInfo **) NULL) return(MagickFalse); status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { const int @@ -1959,7 +1959,7 @@ static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info, depth++; cube_info->offset=0; cube_info->span=(MagickSizeType) image->columns*image->rows; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); if (depth > 1) Riemersma(image,image_view,cube_info,depth-1,NorthGravity,exception); status=RiemersmaDither(image,image_view,cube_info,ForgetGravity,exception); @@ -2219,7 +2219,7 @@ MagickExport MagickBooleanType GetImageQuantizeError(Image *image, maximum_error=0.0; mean_error_per_pixel=0.0; mean_error=0.0; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -2402,7 +2402,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2678,7 +2678,7 @@ static MagickBooleanType DirectToColormapImage(Image *image, if (image->colors != number_colors) return(MagickFalse); i=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { MagickBooleanType @@ -3301,7 +3301,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, image->filename); image->colors=0; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3378,7 +3378,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, image->colormap=(PixelInfo *) RelinquishMagickMemory(image->colormap); image->colormap=colormap; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/resample.c b/MagickCore/resample.c index 4366f8834..35c16cdc0 100644 --- a/MagickCore/resample.c +++ b/MagickCore/resample.c @@ -225,7 +225,7 @@ MagickExport ResampleFilter *AcquireResampleFilter(const Image *image, resample_filter->exception=exception; resample_filter->image=ReferenceImage((Image *) image); - resample_filter->view=AcquireVirtualCacheView(resample_filter->image,exception); + resample_filter->view=AcquireVirtualCacheView(resample_filter->image); resample_filter->debug=IsEventLogging(); resample_filter->signature=MagickSignature; @@ -488,7 +488,7 @@ MagickExport MagickBooleanType ResamplePixelColor( *pixel=resample_filter->average_pixel; /* FAILED */ break; } - average_view=AcquireVirtualCacheView(average_image,exception); + average_view=AcquireVirtualCacheView(average_image); pixels=GetCacheViewVirtualPixels(average_view,0,0,1,1, resample_filter->exception); if (pixels == (const Quantum *) NULL) { diff --git a/MagickCore/resize.c b/MagickCore/resize.c index edee3312e..65f75cf57 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1625,8 +1625,8 @@ MagickExport Image *InterpolativeResizeImage(const Image *image, } status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - resize_view=AcquireAuthenticCacheView(resize_image,exception); + image_view=AcquireVirtualCacheView(image); + resize_view=AcquireAuthenticCacheView(resize_image); scale.x=(double) image->columns/resize_image->columns; scale.y=(double) image->rows/resize_image->rows; #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -1819,7 +1819,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, return((Image *) NULL); status=MagickTrue; q=pixels; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1870,7 +1870,7 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, rescale_image=DestroyImage(rescale_image); return((Image *) NULL); } - rescale_view=AcquireAuthenticCacheView(rescale_image,exception); + rescale_view=AcquireAuthenticCacheView(rescale_image); (void) lqr_carver_scan_reset(carver); while (lqr_carver_scan_ext(carver,&x_offset,&y_offset,(void **) &packet) != 0) { @@ -2236,8 +2236,8 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, } status=MagickTrue; scale=PerceptibleReciprocal(scale); - image_view=AcquireVirtualCacheView(image,exception); - resize_view=AcquireAuthenticCacheView(resize_image,exception); + image_view=AcquireVirtualCacheView(image); + resize_view=AcquireAuthenticCacheView(resize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2450,8 +2450,8 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, status=MagickTrue; scale=PerceptibleReciprocal(scale); (void) ResetMagickMemory(&zero,0,sizeof(zero)); - image_view=AcquireVirtualCacheView(image,exception); - resize_view=AcquireAuthenticCacheView(resize_image,exception); + image_view=AcquireVirtualCacheView(image); + resize_view=AcquireAuthenticCacheView(resize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2801,8 +2801,8 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - sample_view=AcquireAuthenticCacheView(sample_image,exception); + image_view=AcquireVirtualCacheView(image); + sample_view=AcquireAuthenticCacheView(sample_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -3015,8 +3015,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, for (i=0; i < (ssize_t) (GetPixelChannels(image)*image->columns); i++) y_vector[i]=0.0; n=0; - image_view=AcquireVirtualCacheView(image,exception); - scale_view=AcquireAuthenticCacheView(scale_image,exception); + image_view=AcquireVirtualCacheView(image); + scale_view=AcquireAuthenticCacheView(scale_image); for (y=0; y < (ssize_t) scale_image->rows; y++) { register const Quantum diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 2a35850c3..6ecc1902a 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -355,7 +355,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, status=MagickTrue; count=0; progress=0; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -531,7 +531,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, /* Do course grain classes. */ - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 56c72b125..27a0c8040 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -651,7 +651,7 @@ static MagickBooleanType RadonTransform(const Image *image, bits[i]=(unsigned short) count; } status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -779,7 +779,7 @@ static void GetImageBackgroundColor(Image *image,const ssize_t offset, return; GetPixelInfo(image,&background); count=0.0; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1001,8 +1001,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - rotate_view=AcquireAuthenticCacheView(rotate_image,exception); + image_view=AcquireVirtualCacheView(image); + rotate_view=AcquireAuthenticCacheView(rotate_image); switch (rotations) { case 0: @@ -1444,7 +1444,7 @@ static MagickBooleanType XShearImage(Image *image,const double degrees, status=MagickTrue; background=image->background_color; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,width,height,1) @@ -1660,7 +1660,7 @@ static MagickBooleanType YShearImage(Image *image,const double degrees, status=MagickTrue; progress=0; background=image->background_color; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,width,height,1) diff --git a/MagickCore/signature.c b/MagickCore/signature.c index 4a93685d5..184c2c4f1 100644 --- a/MagickCore/signature.c +++ b/MagickCore/signature.c @@ -506,7 +506,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image, signature=AcquireStringInfo(image->columns*GetPixelChannels(image)* sizeof(pixel)); pixels=GetStringInfoDatum(signature); - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register ssize_t diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 482cf03e7..ab7d2be51 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -487,7 +487,7 @@ MagickExport Image *EvaluateImages(const Image *images, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #endif - evaluate_view=AcquireAuthenticCacheView(image,exception); + evaluate_view=AcquireAuthenticCacheView(image); if (op == MedianEvaluateOperator) { #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -542,7 +542,7 @@ MagickExport Image *EvaluateImages(const Image *images, register ssize_t i; - image_view=AcquireVirtualCacheView(next,exception); + image_view=AcquireVirtualCacheView(next); p=GetCacheViewVirtualPixels(image_view,x,y,1,1,exception); if (p == (const Quantum *) NULL) { @@ -645,7 +645,7 @@ MagickExport Image *EvaluateImages(const Image *images, register const Quantum *p; - image_view=AcquireVirtualCacheView(next,exception); + image_view=AcquireVirtualCacheView(next); p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception); if (p == (const Quantum *) NULL) { @@ -807,7 +807,7 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #endif - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,key == ~0UL) @@ -1036,7 +1036,7 @@ MagickExport MagickBooleanType FunctionImage(Image *image, return(MagickFalse); status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1300,7 +1300,7 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image, sum_squares=0.0; sum_cubes=0.0; sum_fourth_power=0.0; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1427,7 +1427,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, initialize=MagickTrue; *maxima=0.0; *minima=0.0; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status,initialize) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1820,7 +1820,7 @@ MagickExport Image *PolynomialImage(const Image *images, */ status=MagickTrue; progress=0; - polynomial_view=AcquireAuthenticCacheView(image,exception); + polynomial_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1870,7 +1870,7 @@ MagickExport Image *PolynomialImage(const Image *images, if (j >= (ssize_t) number_terms) continue; - image_view=AcquireVirtualCacheView(next,exception); + image_view=AcquireVirtualCacheView(next); p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); if (p == (const Quantum *) NULL) { @@ -2497,8 +2497,8 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, (MagickMax(height,1)/2L)+GetPixelChannels(image)*(MagickMax(width,1)/2L); status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - statistic_view=AcquireAuthenticCacheView(statistic_image,exception); + image_view=AcquireVirtualCacheView(image); + statistic_view=AcquireAuthenticCacheView(statistic_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index cec9f3567..b21b12593 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -202,8 +202,8 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, status=MagickTrue; progress=0; number_pixels=(MagickSizeType) width*height; - image_view=AcquireVirtualCacheView(image,exception); - threshold_view=AcquireAuthenticCacheView(threshold_image,exception); + image_view=AcquireVirtualCacheView(image); + threshold_view=AcquireAuthenticCacheView(threshold_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -408,7 +408,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -579,7 +579,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -737,7 +737,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1360,7 +1360,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, return(MagickFalse); status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1534,7 +1534,7 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1701,7 +1701,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #endif - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,key == ~0UL) @@ -1881,7 +1881,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 91b5b6e96..2a6ba1f81 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -157,8 +157,8 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - chop_view=AcquireAuthenticCacheView(chop_image,exception); + image_view=AcquireVirtualCacheView(image); + chop_view=AcquireAuthenticCacheView(chop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(NoBenefitFromParallelism) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -371,8 +371,8 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images, (void) SetImageColorspace(cmyk_image,CMYKColorspace,exception); for (i=0; i < 4; i++) { - image_view=AcquireVirtualCacheView(images,exception); - cmyk_view=AcquireAuthenticCacheView(cmyk_image,exception); + image_view=AcquireVirtualCacheView(images); + cmyk_view=AcquireAuthenticCacheView(cmyk_image); for (y=0; y < (ssize_t) images->rows; y++) { register const Quantum @@ -584,8 +584,8 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - crop_view=AcquireAuthenticCacheView(crop_image,exception); + image_view=AcquireVirtualCacheView(image); + crop_view=AcquireAuthenticCacheView(crop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -946,8 +946,8 @@ MagickExport Image *ExcerptImage(const Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - excerpt_view=AcquireAuthenticCacheView(excerpt_image,exception); + image_view=AcquireVirtualCacheView(image); + excerpt_view=AcquireAuthenticCacheView(excerpt_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1154,8 +1154,8 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) status=MagickTrue; progress=0; page=image->page; - image_view=AcquireVirtualCacheView(image,exception); - flip_view=AcquireAuthenticCacheView(flip_image,exception); + image_view=AcquireVirtualCacheView(image); + flip_view=AcquireAuthenticCacheView(flip_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(NoBenefitFromParallelism) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1301,8 +1301,8 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) status=MagickTrue; progress=0; page=image->page; - image_view=AcquireVirtualCacheView(image,exception); - flop_view=AcquireAuthenticCacheView(flop_image,exception); + image_view=AcquireVirtualCacheView(image); + flop_view=AcquireAuthenticCacheView(flop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(NoBenefitFromParallelism) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -1431,8 +1431,8 @@ static inline MagickBooleanType CopyImageRegion(Image *destination, y; status=MagickTrue; - source_view=AcquireVirtualCacheView(source,exception); - destination_view=AcquireAuthenticCacheView(destination,exception); + source_view=AcquireVirtualCacheView(source); + destination_view=AcquireAuthenticCacheView(destination); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(source,columns,rows,1) @@ -1760,8 +1760,8 @@ MagickExport Image *SpliceImage(const Image *image, */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - splice_view=AcquireAuthenticCacheView(splice_image,exception); + image_view=AcquireVirtualCacheView(image); + splice_view=AcquireAuthenticCacheView(splice_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2217,8 +2217,8 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - transpose_view=AcquireAuthenticCacheView(transpose_image,exception); + image_view=AcquireVirtualCacheView(image); + transpose_view=AcquireAuthenticCacheView(transpose_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) @@ -2367,8 +2367,8 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) */ status=MagickTrue; progress=0; - image_view=AcquireVirtualCacheView(image,exception); - transverse_view=AcquireAuthenticCacheView(transverse_image,exception); + image_view=AcquireVirtualCacheView(image); + transverse_view=AcquireAuthenticCacheView(transverse_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ dynamic_number_threads(image,image->columns,image->rows,1) diff --git a/MagickCore/version.h b/MagickCore/version.h index 60e54c817..809a4b8ed 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -34,7 +34,7 @@ extern "C" { #define MagickLibAddendum "-0" #define MagickLibInterface 8 #define MagickLibMinInterface 8 -#define MagickReleaseDate "2012-12-11" +#define MagickReleaseDate "2012-12-13" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index 1d5239193..2eeb76a3a 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -561,7 +561,7 @@ MagickPrivate MagickBooleanType XAnnotateImage(Display *display, (ssize_t) y,&annotate_image->background_color,exception); if (annotate_info->stencil == ForegroundStencil) annotate_image->alpha_trait=BlendPixelTrait; - annotate_view=AcquireAuthenticCacheView(annotate_image,exception); + annotate_view=AcquireAuthenticCacheView(annotate_image); for (y=0; y < (int) annotate_image->rows; y++) { register int @@ -2227,7 +2227,7 @@ static void XDitherImage(Image *image,XImage *ximage,ExceptionInfo *exception) i=0; j=0; q=ximage->data; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); for (y=0; y < (int) image->rows; y++) { p=GetCacheViewVirtualPixels(image_view,0,(ssize_t) y,image->columns,1, @@ -2484,7 +2484,7 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display, if (SetImageStorageClass(draw_image,DirectClass,exception) == MagickFalse) return(MagickFalse); draw_image->alpha_trait=BlendPixelTrait; - draw_view=AcquireAuthenticCacheView(draw_image,exception); + draw_view=AcquireAuthenticCacheView(draw_image); for (y=0; y < (int) draw_image->rows; y++) { register int @@ -2610,7 +2610,7 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display, /* Composite text onto the image. */ - draw_view=AcquireAuthenticCacheView(draw_image,exception); + draw_view=AcquireAuthenticCacheView(draw_image); for (y=0; y < (int) draw_image->rows; y++) { register int @@ -4366,7 +4366,7 @@ static Image *XGetWindowImage(Display *display,const Window window, composite_image->storage_class=PseudoClass; composite_image->columns=(size_t) ximage->width; composite_image->rows=(size_t) ximage->height; - composite_view=AcquireAuthenticCacheView(composite_image,exception); + composite_view=AcquireAuthenticCacheView(composite_image); switch (composite_image->storage_class) { case DirectClass: @@ -5954,7 +5954,7 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, pixels=window->pixel_info->pixels; q=(unsigned char *) ximage->data; x=0; - canvas_view=AcquireVirtualCacheView(canvas,exception); + canvas_view=AcquireVirtualCacheView(canvas); if (ximage->format == XYBitmap) { register unsigned short @@ -6580,7 +6580,7 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, pixels=window->pixel_info->pixels; q=(unsigned char *) ximage->data; x=0; - canvas_view=AcquireVirtualCacheView(canvas,exception); + canvas_view=AcquireVirtualCacheView(canvas); if (ximage->format == XYBitmap) { register unsigned short @@ -8001,7 +8001,7 @@ MagickPrivate void XMakeStandardColormap(Display *display, diversity[i].index=(unsigned short) i; diversity[i].count=0; } - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (int) image->rows; y++) { register int @@ -9737,7 +9737,7 @@ MagickPrivate Window XWindowByProperty(Display *display,const Window window, % o exception: return any errors or warnings in this structure. % */ -MagickPrivate Image *XImportImage(const ImageInfo *image_info, +MagickExport Image *XImportImage(const ImageInfo *image_info, XImportInfo *ximage_info,ExceptionInfo *exception) { assert(image_info != (const ImageInfo *) NULL); diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index de5f5af7a..23d6d661b 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -5205,7 +5205,7 @@ WandExport MagickBooleanType MagickGetImagePixelColor(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - image_view=AcquireVirtualCacheView(wand->images,wand->exception); + image_view=AcquireVirtualCacheView(wand->images); p=GetCacheViewVirtualPixels(image_view,x,y,1,1,wand->exception); if (p == (const Quantum *) NULL) { diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 74dfed2d8..03ef76a6e 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -1112,7 +1112,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, break; if (SetImageStorageClass(mask_image,DirectClass,exception) == MagickFalse) return(MagickFalse); - mask_view=AcquireAuthenticCacheView(mask_image,exception); + mask_view=AcquireAuthenticCacheView(mask_image); for (y=0; y < (ssize_t) mask_image->rows; y++) { q=GetCacheViewAuthenticPixels(mask_view,0,y,mask_image->columns,1, diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 9d75c3b78..a087790b6 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -2004,7 +2004,7 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand, break; /* Create a write mask from cli_wand mask image */ /* FUTURE: use Alpha operations instead and create a Grey Image */ - mask_view=AcquireAuthenticCacheView(mask_image,_exception); + mask_view=AcquireAuthenticCacheView(mask_image); for (y=0; y < (ssize_t) mask_image->rows; y++) { q=GetCacheViewAuthenticPixels(mask_view,0,y,mask_image->columns,1, diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c index e15128ddd..14732cc60 100644 --- a/MagickWand/pixel-iterator.c +++ b/MagickWand/pixel-iterator.c @@ -314,7 +314,7 @@ WandExport PixelIterator *NewPixelIterator(MagickWand *wand) if (image == (Image *) NULL) return((PixelIterator *) NULL); exception=AcquireExceptionInfo(); - view=AcquireVirtualCacheView(image,exception); + view=AcquireVirtualCacheView(image); if (view == (CacheView *) NULL) return((PixelIterator *) NULL); iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*iterator)); @@ -433,7 +433,7 @@ WandExport PixelIterator *NewPixelRegionIterator(MagickWand *wand, if (image == (Image *) NULL) return((PixelIterator *) NULL); exception=AcquireExceptionInfo(); - view=AcquireVirtualCacheView(image,exception); + view=AcquireVirtualCacheView(image); if (view == (CacheView *) NULL) return((PixelIterator *) NULL); iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*iterator)); diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index f854d6ab6..96a8a5a5a 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -765,7 +765,7 @@ WandExport WandView *NewWandView(MagickWand *wand) wand_view->description=ConstantString("WandView"); wand_view->wand=wand; exception=AcquireExceptionInfo(); - wand_view->view=AcquireVirtualCacheView(wand_view->wand->images,exception); + wand_view->view=AcquireVirtualCacheView(wand_view->wand->images); wand_view->extent.width=wand->images->columns; wand_view->extent.height=wand->images->rows; wand_view->pixel_wands=AcquirePixelsThreadSet(wand_view->extent.width); @@ -826,7 +826,7 @@ WandExport WandView *NewWandViewExtent(MagickWand *wand,const ssize_t x, WandViewId,(double) wand_view->id); wand_view->description=ConstantString("WandView"); exception=AcquireExceptionInfo(); - wand_view->view=AcquireVirtualCacheView(wand_view->wand->images,exception); + wand_view->view=AcquireVirtualCacheView(wand_view->wand->images); wand_view->wand=wand; wand_view->extent.width=width; wand_view->extent.height=height; diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index d72d81eea..e02bf4fb5 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -1586,7 +1586,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, y=0; items=sscanf(attribute,"%*[^[][%ld%*[,/]%ld",&x,&y); (void) items; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception); if (q != (Quantum *) NULL) { @@ -1810,7 +1810,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, y=0; items=sscanf(attribute,"%*[^[][%ld%*[,/]%ld",&x,&y); (void) items; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception); if (q != (Quantum *) NULL) { @@ -5011,7 +5011,7 @@ Get(ref,...) y=0; items=sscanf(attribute,"%*[^[][%ld%*[,/]%ld",&x,&y); (void) items; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); p=GetCacheViewVirtualPixels(image_view,x,y,1,1,exception); if (p != (const Quantum *) NULL) { @@ -8431,8 +8431,7 @@ Mogrify(ref,...) 1.0); if (composite_image->alpha_trait == BlendPixelTrait) (void) SetImageAlpha(composite_image,OpaqueAlpha,exception); - composite_view=AcquireAuthenticCacheView(composite_image, - exception); + composite_view=AcquireAuthenticCacheView(composite_image); for (y=0; y < (ssize_t) composite_image->rows ; y++) { q=GetCacheViewAuthenticPixels(composite_view,0,y,(ssize_t) diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 8e3f82fff..33aebf16b 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -156,11 +156,11 @@ foreach my $delegate (@tested_delegates) { } # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile -my $INC_magick = '-I../ -I.. -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; +my $INC_magick = '-I../ -I.. -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../MagickCore/.libs -lMagickCore-Q16HDRI -lperl -lm'; -my $CCFLAGS_magick = "$Config{'ccflags'} -pthread -I/usr/include/OpenEXR -I/usr/include/lqr-1 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -fopenmp -g -O2 -Wall -pthread"; -my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'ldflags'} -L/usr/lib"; -my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'lddlflags'} -L/usr/lib"; +my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread"; +my $LDFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'ldflags'} "; +my $LDDLFLAGS_magick = "-L../MagickCore/.libs -lMagickCore-Q16HDRI $Config{'lddlflags'} "; if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) { my($Ipaths, $Lpaths) = AutodetectWin32gcc(); @@ -201,7 +201,7 @@ WriteMakefile #'CC' => 'gcc -std=gnu99 -std=gnu99', # C pre-processor flags (e.g. -I & -D options) - # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/freetype2 -I/usr/include/libxml2", + # 'CPPFLAGS' => "$Config{'cppflags'} ", # C compiler flags (e.g. -O -g) 'CCFLAGS' => $CCFLAGS_magick, diff --git a/coders/tiff.c b/coders/tiff.c index 0b57bc381..388c3c228 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -439,7 +439,7 @@ static MagickBooleanType DecodeLabImage(Image *image,ExceptionInfo *exception) y; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register Quantum @@ -2302,7 +2302,7 @@ static MagickBooleanType EncodeLabImage(Image *image,ExceptionInfo *exception) y; status=MagickTrue; - image_view=AcquireAuthenticCacheView(image,exception); + image_view=AcquireAuthenticCacheView(image); for (y=0; y < (ssize_t) image->rows; y++) { register Quantum diff --git a/filters/analyze.c b/filters/analyze.c index de5f0da9b..e32fa8502 100644 --- a/filters/analyze.c +++ b/filters/analyze.c @@ -143,7 +143,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, saturation_skewness=0.0; area=0.0; status=MagickTrue; - image_view=AcquireVirtualCacheView(image,exception); + image_view=AcquireVirtualCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ dynamic_number_threads(image,image->columns,image->rows,1)