From: cristy Date: Sat, 19 Jan 2013 21:22:40 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4404 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c201dfec78dcada9c45d19d1a5341b125524b2d3;p=imagemagick --- diff --git a/MagickCore/cache.c b/MagickCore/cache.c index bee3eb2d4..e62295aef 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -820,6 +820,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != length) { status=MagickFalse; + ThrowFileException(exception,CacheError,"UnableToReadPixelCache", + cache_info->cache_filename); break; } } @@ -859,6 +861,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != sizeof(Quantum)) { status=MagickFalse; + ThrowFileException(exception,CacheError, + "UnableToWritePixelCache",cache_info->cache_filename); break; } } @@ -884,6 +888,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != length) { status=MagickFalse; + ThrowFileException(exception,CacheError, + "UnableToWritePixelCache",cache_info->cache_filename); break; } } @@ -909,6 +915,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != length) { status=MagickFalse; + ThrowFileException(exception,CacheError,"UnableToWritePixelCache", + cache_info->cache_filename); break; } } @@ -938,6 +946,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != length) { status=MagickFalse; + ThrowFileException(exception,CacheError, + "UnableToWritePixelCache",cache_info->cache_filename); break; } } @@ -959,6 +969,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != length) { status=MagickFalse; + ThrowFileException(exception,CacheError, + "UnableToWritePixelCache",cache_info->cache_filename); break; } } @@ -982,6 +994,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != length) { status=MagickFalse; + ThrowFileException(exception,CacheError, + "UnableToWritePixelCache",cache_info->cache_filename); break; } } @@ -1010,6 +1024,8 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info, if ((MagickSizeType) count != length) { status=MagickFalse; + ThrowFileException(exception,CacheError, + "UnableToWritePixelCache",cache_info->cache_filename); break; } } @@ -3890,7 +3906,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode, (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s", message); } - return(MagickTrue); + return(status); } } (void) ThrowMagickException(exception,GetMagickModule(),CacheError,