From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 13 Mar 2010 16:11:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9807
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc8b63f9287320dd1004bcf80c464fe302cb7461;p=imagemagick

---

diff --git a/magick/cache.c b/magick/cache.c
index e39dedbf9..4e6fe165a 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -3287,7 +3287,7 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   cache_info=(CacheInfo *) image->cache;
-  if (cache_info->type == UndefinedCache)
+  if ((cache_info->type == UndefinedCache) || (columns == 0) || (rows == 0))
     return((const PixelPacket *) NULL);
   region.x=x;
   region.y=y;
@@ -3311,6 +3311,7 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
         /*
           Pixel request is inside cache extents.
         */
+puts("a");
         if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
           return(pixels);
         status=ReadPixelCachePixels(cache_info,nexus_info,exception);
@@ -5013,10 +5014,7 @@ static PixelPacket *SetPixelCacheNexusPixels(const Image *image,
   assert(cache_info->signature == MagickSignature);
   if (cache_info->type == UndefinedCache)
     return((PixelPacket *) NULL);
-  nexus_info->region.width=region->width == 0UL ? 1UL : region->width;
-  nexus_info->region.height=region->height == 0UL ? 1UL : region->height;
-  nexus_info->region.x=region->x;
-  nexus_info->region.y=region->y;
+  nexus_info->region=(*region);
   if ((cache_info->type != DiskCache) && (image->clip_mask == (Image *) NULL) &&
       (image->mask == (Image *) NULL))
     {