From 4b100ef3f57b9c24a10f24ad4ce3fd6505adb8ba Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 12 Jun 2015 22:59:01 +0000 Subject: [PATCH] --- MagickCore/cache-private.h | 3 --- MagickCore/cache.c | 8 ++------ MagickCore/stream.c | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h index 54a9b0080..8b54f440e 100644 --- a/MagickCore/cache-private.h +++ b/MagickCore/cache-private.h @@ -98,9 +98,6 @@ typedef struct _CacheMethods DestroyPixelHandler destroy_pixel_handler; - - MagickBooleanType - stream; } CacheMethods; typedef struct _NexusInfo diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 1296b36ce..2758e6b9d 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -3352,8 +3352,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, ThrowBinaryException(CacheError,"NoPixelsDefinedInCache",image->filename); cache_info=(CacheInfo *) image->cache; assert(cache_info->signature == MagickSignature); - if (cache_info->methods.stream != MagickFalse) - return(MagickTrue); if ((AcquireMagickResource(WidthResource,image->columns) == MagickFalse) || (AcquireMagickResource(HeightResource,image->rows) == MagickFalse)) ThrowBinaryException(ResourceLimitError,"PixelCacheAllocationFailed", @@ -3377,10 +3375,9 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, cache_info->mode=mode; if (image->ping != MagickFalse) { + cache_info->storage_class=image->storage_class; + cache_info->colorspace=image->colorspace; cache_info->type=PingCache; - cache_info->pixels=(Quantum *) NULL; - cache_info->metacontent=(void *) NULL; - cache_info->length=0; return(MagickTrue); } number_pixels=(MagickSizeType) cache_info->columns*cache_info->rows; @@ -4474,7 +4471,6 @@ MagickPrivate void SetPixelCacheMethods(Cache cache,CacheMethods *cache_methods) (GetOneAuthenticPixelFromHandler) NULL) cache_info->methods.get_one_authentic_pixel_from_handler= cache_methods->get_one_authentic_pixel_from_handler; - cache_info->methods.stream=cache_methods->stream; } /* diff --git a/MagickCore/stream.c b/MagickCore/stream.c index 0fd456542..9eaeec80c 100644 --- a/MagickCore/stream.c +++ b/MagickCore/stream.c @@ -1005,7 +1005,6 @@ MagickExport Image *ReadStream(const ImageInfo *image_info,StreamHandler stream, cache_methods.get_one_authentic_pixel_from_handler= GetOneAuthenticPixelFromStream; cache_methods.destroy_pixel_handler=DestroyPixelStream; - cache_methods.stream=MagickTrue; SetPixelCacheMethods(read_info->cache,&cache_methods); read_info->stream=stream; image=ReadImage(read_info,exception); -- 2.40.0