From: cristy Date: Mon, 13 Sep 2010 00:51:10 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8942 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77ff0289298e23107ec82f70904b32c88ae3cfb7;p=imagemagick --- diff --git a/magick/cache-private.h b/magick/cache-private.h index 2404353fc..1ccad342c 100644 --- a/magick/cache-private.h +++ b/magick/cache-private.h @@ -195,7 +195,6 @@ extern MagickExport Cache AcquirePixelCache(const size_t), ClonePixelCache(const Cache), DestroyPixelCache(Cache), - GetImagePixelCache(Image *,const MagickBooleanType,ExceptionInfo *), ReferencePixelCache(Cache); extern MagickExport CacheType diff --git a/magick/cache-view.c b/magick/cache-view.c index d0e7a3916..09f35167f 100644 --- a/magick/cache-view.c +++ b/magick/cache-view.c @@ -388,9 +388,6 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view, const ssize_t x,const ssize_t y,const size_t columns,const size_t rows, ExceptionInfo *exception) { - Cache - cache; - int id; @@ -399,9 +396,6 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view, assert(cache_view != (CacheView *) NULL); assert(cache_view->signature == MagickSignature); - cache=GetImagePixelCache(cache_view->image,MagickTrue,exception); - if (cache == (Cache) NULL) - return((PixelPacket *) NULL); id=GetOpenMPThreadId(); assert(id < (int) cache_view->number_threads); pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows, @@ -444,9 +438,6 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel( const CacheView *cache_view,const ssize_t x,const ssize_t y, PixelPacket *pixel,ExceptionInfo *exception) { - Cache - cache; - int id; @@ -455,9 +446,6 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel( assert(cache_view != (CacheView *) NULL); assert(cache_view->signature == MagickSignature); - cache=GetImagePixelCache(cache_view->image,MagickTrue,exception); - if (cache == (Cache) NULL) - return(MagickFalse); *pixel=cache_view->image->background_color; id=GetOpenMPThreadId(); assert(id < (int) cache_view->number_threads); @@ -845,9 +833,6 @@ MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view, const ssize_t x,const ssize_t y,const size_t columns,const size_t rows, ExceptionInfo *exception) { - Cache - cache; - int id; @@ -856,9 +841,6 @@ MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view, assert(cache_view != (CacheView *) NULL); assert(cache_view->signature == MagickSignature); - cache=GetImagePixelCache(cache_view->image,MagickFalse,exception); - if (cache == (Cache) NULL) - return((PixelPacket *) NULL); id=GetOpenMPThreadId(); assert(id < (int) cache_view->number_threads); pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows, diff --git a/magick/cache.c b/magick/cache.c index eaca13754..d6ea5cb89 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -435,7 +435,7 @@ static MagickBooleanType ClipPixelCacheNexus(Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->clip_mask == (Image *) NULL) return(MagickFalse); - cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception); + cache_info=(CacheInfo *) image->cache; if (cache_info == (Cache) NULL) return(MagickFalse); image_nexus=AcquirePixelCacheNexus(1); @@ -2038,7 +2038,7 @@ static PixelPacket *GetAuthenticPixelsCache(Image *image,const ssize_t x, PixelPacket *pixels; - cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception); + cache_info=(CacheInfo *) image->cache; if (cache_info == (Cache) NULL) return((PixelPacket *) NULL); id=GetOpenMPThreadId(); @@ -2143,8 +2143,8 @@ static inline MagickBooleanType ValidatePixelCacheMorphology(const Image *image) return(MagickTrue); } -MagickExport Cache GetImagePixelCache(Image *image, - const MagickBooleanType clone,ExceptionInfo *exception) +static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone, + ExceptionInfo *exception) { CacheInfo *cache_info; @@ -2829,7 +2829,7 @@ MagickExport void *GetPixelCachePixels(Image *image,MagickSizeType *length, assert(image != (const Image *) NULL); assert(image->signature == MagickSignature); assert(image->cache != (Cache) NULL); - cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception); + cache_info=(CacheInfo *) image->cache; assert(cache_info->signature == MagickSignature); *length=0; if ((cache_info->type != MemoryCache) && (cache_info->type != MapCache)) @@ -3910,7 +3910,7 @@ static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->mask == (Image *) NULL) return(MagickFalse); - cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception); + cache_info=(CacheInfo *) image->cache; if (cache_info == (Cache) NULL) return(MagickFalse); image_nexus=AcquirePixelCacheNexus(1); @@ -4425,7 +4425,9 @@ MagickExport PixelPacket *QueueAuthenticNexus(Image *image,const ssize_t x, /* Validate pixel cache geometry. */ - cache_info=(CacheInfo *) image->cache; + cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception); + if (cache_info == (Cache) NULL) + return((PixelPacket *) NULL); if ((cache_info->columns == 0) && (cache_info->rows == 0)) { (void) ThrowMagickException(exception,GetMagickModule(),CacheError, @@ -4502,7 +4504,7 @@ static PixelPacket *QueueAuthenticPixelsCache(Image *image,const ssize_t x, PixelPacket *pixels; - cache_info=(CacheInfo *) GetImagePixelCache(image,MagickFalse,exception); + cache_info=(CacheInfo *) image->cache; if (cache_info == (Cache) NULL) return((PixelPacket *) NULL); id=GetOpenMPThreadId(); diff --git a/magick/colorspace.c b/magick/colorspace.c index 0347608e9..b8ea5b18e 100644 --- a/magick/colorspace.c +++ b/magick/colorspace.c @@ -1170,15 +1170,15 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, MagickExport MagickBooleanType SetImageColorspace(Image *image, const ColorspaceType colorspace) { - Cache - cache; + PixelPacket + *pixels; if (image->colorspace == colorspace) return(MagickTrue); image->colorspace=colorspace; - cache=GetImagePixelCache(image,MagickTrue,&image->exception); + pixels=QueueAuthenticPixels(image,0,0,1,1,&image->exception); image->colorspace=colorspace; /* GRAY colorspace might get reset to RGB */ - return(cache == (Cache) NULL ? MagickFalse: MagickTrue); + return(pixels == (PixelPacket *) NULL ? MagickFalse : MagickTrue); } /* diff --git a/magick/image.c b/magick/image.c index 944b04b6f..fc4d8b6ef 100644 --- a/magick/image.c +++ b/magick/image.c @@ -2939,14 +2939,14 @@ MagickExport MagickBooleanType SetImageColor(Image *image, MagickExport MagickBooleanType SetImageStorageClass(Image *image, const ClassType storage_class) { - Cache - cache; + PixelPacket + *pixels; if (image->storage_class == storage_class) return(MagickTrue); image->storage_class=storage_class; - cache=GetImagePixelCache(image,MagickTrue,&image->exception); - return(cache == (Cache) NULL ? MagickFalse : MagickTrue); + pixels=QueueAuthenticPixels(image,0,0,1,1,&image->exception); + return(pixels == (PixelPacket *) NULL ? MagickFalse : MagickTrue); } /* @@ -3030,16 +3030,16 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image, MagickExport MagickBooleanType SetImageExtent(Image *image, const size_t columns,const size_t rows) { - Cache - cache; + PixelPacket + *pixels; if ((columns != 0) && (rows != 0)) { image->columns=columns; image->rows=rows; } - cache=GetImagePixelCache(image,MagickTrue,&image->exception); - return(cache == (Cache) NULL ? MagickFalse : MagickTrue); + pixels=QueueAuthenticPixels(image,0,0,1,1,&image->exception); + return(pixels == (PixelPacket *) NULL ? MagickFalse : MagickTrue); } /*