From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 16 Dec 2014 12:26:43 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1623
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fc35e90e200f5cffd0edc3ddce8be5ddea38146;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 19ce17d05..ae155a86e 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -471,29 +471,6 @@ MagickPrivate void ClonePixelCacheMethods(Cache clone,const Cache cache)
 %
 */
 
-static inline void CopyPixels(Quantum *destination,const Quantum *source,
-  const MagickSizeType number_pixels)
-{
-#if !defined(MAGICKCORE_OPENMP_SUPPORT) || (MAGICKCORE_QUANTUM_DEPTH <= 8)
-  (void) memcpy(destination,source,(size_t) number_pixels*sizeof(*source));
-#else
-  {
-    register MagickOffsetType
-      i;
-
-    if ((number_pixels*sizeof(*source)) < MagickMaxBufferExtent)
-      {
-        (void) memcpy(destination,source,(size_t) number_pixels*
-          sizeof(*source));
-        return;
-      }
-    #pragma omp parallel for
-    for (i=0; i < (MagickOffsetType) number_pixels; i++)
-      destination[i]=source[i];
-  }
-#endif
-}
-
 static inline MagickSizeType MagickMin(const MagickSizeType x,
   const MagickSizeType y)
 {
@@ -540,13 +517,14 @@ static MagickBooleanType ClonePixelCacheRepository(
       (memcmp(cache_info->channel_map,clone_info->channel_map,length) == 0) &&
       (cache_info->metacontent_extent == clone_info->metacontent_extent))
     {
-      CopyPixels(clone_info->pixels,cache_info->pixels,cache_info->columns*
-        cache_info->number_channels*cache_info->rows);
+      (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))
         (void) memcpy(clone_info->metacontent,cache_info->metacontent,
           cache_info->columns*cache_info->rows*clone_info->metacontent_extent*
-          sizeof(cache_info->metacontent));
+          sizeof(*cache_info->metacontent));
       return(MagickTrue);
     }
   /*