]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Mon, 28 Jan 2013 00:31:49 +0000 (00:31 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Mon, 28 Jan 2013 00:31:49 +0000 (00:31 +0000)
MagickCore/cache.c

index 7e357708f942d3ee1ffe40fb83e600e815c1ab8b..8ae29e527a21d3c18236152d03e61484e4824955 100644 (file)
@@ -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));