commit 77ff0289298e23107ec82f70904b32c88ae3cfb7
author cristy <urban-warrior@git.imagemagick.org> Mon Sep 13 00:51:10 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Mon Sep 13 00:51:10 2010 +0000
tree 9739726632f80296aa7a428e0cc29c88e0454c18
parent 9de351bb25cf5995654d32870f97966731ce04f9

magick/cache.c

diff --git a/magick/cache.c b/magick/cache.c
index eaca137..d6ea5cb 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -435,7 +435,7 @@
     (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 @@
   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 @@
   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 @@
   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 @@
     (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 @@
   /*
     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 @@
   PixelPacket
     *pixels;
 
-  cache_info=(CacheInfo *) GetImagePixelCache(image,MagickFalse,exception);
+  cache_info=(CacheInfo *) image->cache;
   if (cache_info == (Cache) NULL)
     return((PixelPacket *) NULL);
   id=GetOpenMPThreadId();