From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 17 May 2012 18:16:56 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5580
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=238287d3e8b59f2040fc10e52b48ac53e2645e7d;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 2c9157a4e..8f34945cd 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -123,9 +123,6 @@ static Cache
   GetImagePixelCache(Image *,const MagickBooleanType,ExceptionInfo *)
     magick_hot_spot;
 
-static CacheType
-  GetPixelCacheType(const Image *);
-
 static const Quantum
   *GetVirtualPixelCache(const Image *,const VirtualPixelMethod,const ssize_t,
     const ssize_t,const size_t,const size_t,ExceptionInfo *),
@@ -2000,7 +1997,15 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
 */
 MagickExport CacheType GetImagePixelCacheType(const Image *image)
 {
-  return(GetPixelCacheType(image));
+  CacheInfo
+    *cache_info;
+
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickSignature);
+  assert(image->cache != (Cache) NULL);
+  cache_info=(CacheInfo *) image->cache;
+  assert(cache_info->signature == MagickSignature);
+  return(cache_info->type);
 }
 
 /*
@@ -2698,7 +2703,7 @@ MagickPrivate void GetPixelCacheTileSize(const Image *image,size_t *width,
   cache_info=(CacheInfo *) image->cache;
   assert(cache_info->signature == MagickSignature);
   *width=2048UL/(cache_info->number_channels*sizeof(Quantum));
-  if (GetPixelCacheType(image) == DiskCache)
+  if (GetImagePixelCacheType(image) == DiskCache)
     *width=8192UL/(cache_info->number_channels*sizeof(Quantum));
   *height=(*width);
 }
@@ -2708,41 +2713,6 @@ MagickPrivate void GetPixelCacheTileSize(const Image *image,size_t *width,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   G e t P i x e l C a c h e T y p e                                         %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  GetPixelCacheType() returns the pixel cache type (e.g. memory, disk, etc.).
-%
-%  The format of the GetPixelCacheType() method is:
-%
-%      CacheType GetPixelCacheType(const Image *image)
-%
-%  A description of each parameter follows:
-%
-%    o image: the image.
-%
-*/
-static CacheType GetPixelCacheType(const Image *image)
-{
-  CacheInfo
-    *cache_info;
-
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
-  assert(image->cache != (Cache) NULL);
-  cache_info=(CacheInfo *) image->cache;
-  assert(cache_info->signature == MagickSignature);
-  return(cache_info->type);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 +   G e t P i x e l C a c h e V i r t u a l M e t h o d                       %
 %                                                                             %
 %                                                                             %