From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 23 Jan 2013 23:34:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4368
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c810655e3490bbdd848c0913afa1b6c837190d2;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index a748d0014..8db2469a3 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -408,7 +408,7 @@ MagickPrivate Cache ClonePixelCache(const Cache cache)
   const CacheInfo
     *cache_info;
 
-  assert(cache != NULL);
+  assert(cache != (const Cache) NULL);
   cache_info=(const CacheInfo *) cache;
   assert(cache_info->signature == MagickSignature);
   if (cache_info->debug != MagickFalse)
@@ -599,7 +599,6 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
     if (status == MagickFalse)
       continue;
     region.width=clone_info->columns;
-    region.y=y;
     pixels=SetPixelCacheNexusPixels(clone_info,WriteMode,&region,
       clone_nexus[id],exception);
     if (pixels == (Quantum *) NULL)
@@ -686,7 +685,6 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
         if (status == MagickFalse)
           continue;
         region.width=clone_info->columns;
-        region.y=y;
         pixels=SetPixelCacheNexusPixels(clone_info,WriteMode,&region,
           clone_nexus[id],exception);
         if (pixels == (Quantum *) NULL)
@@ -3562,7 +3560,11 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
         {
           status=OpenDistributePixelCache(server_info,image);
           if (status == MagickFalse)
-            server_info=DestroyDistributeCacheInfo(server_info);
+            {
+              ThrowFileException(exception,CacheError,"UnableToOpenPixelCache",
+                GetDistributeCacheHostname(server_info));
+              server_info=DestroyDistributeCacheInfo(server_info);
+            }
           else
             {
               /*