diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 2c9157a..8f34945 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -123,9 +123,6 @@
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 @@
*/
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 @@
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 @@
% %
% %
% %
-+ 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 %
% %
% %