From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 28 Jan 2013 00:31:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4326
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55a1ce809135e87e18c59be50055a68b15be7057;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 7e357708f..8ae29e527 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -534,7 +534,8 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
       (cache_info->columns == clone_info->columns) &&
       (cache_info->rows == clone_info->rows) &&
       (cache_info->number_channels == clone_info->number_channels) &&
-      (memcmp(cache_info->channel_map,clone_info->channel_map,length) == 0))
+      (memcmp(cache_info->channel_map,clone_info->channel_map,length) == 0) &&
+      (cache_info->metacontent_extent == clone_info->metacontent_extent))
     {
       /*
         Identical pixel cache morphology.
@@ -542,9 +543,7 @@ static MagickBooleanType ClonePixelCacheRepository(CacheInfo *clone_info,
       (void) memcpy(clone_info->pixels,cache_info->pixels,cache_info->columns*
         cache_info->number_channels*cache_info->rows*
         sizeof(*cache_info->pixels));
-      if ((cache_info->metacontent_extent != 0) &&
-          (clone_info->metacontent_extent != 0) &&
-          (cache_info->metacontent_extent == clone_info->metacontent_extent))
+      if (cache_info->metacontent_extent != 0)
         (void) memcpy(clone_info->metacontent,cache_info->metacontent,
           cache_info->columns*cache_info->rows*clone_info->metacontent_extent*
           sizeof(*cache_info->metacontent));