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

---

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index 685594f84..71d676808 100644
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -197,9 +197,6 @@ extern MagickPrivate Cache
   DestroyPixelCache(Cache),
   ReferencePixelCache(Cache);
 
-extern MagickPrivate CacheType
-  GetPixelCacheType(const Image *);
-
 extern MagickPrivate ClassType
   GetPixelCacheStorageClass(const Cache);
 
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 050d1880e..2c9157a4e 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -123,6 +123,9 @@ 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 *),
@@ -1988,23 +1991,16 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
 %
 %  The format of the GetImagePixelCacheType() method is:
 %
-%      const CacheType GetImagePixelCacheType(const Image *image)
+%      CacheType GetImagePixelCacheType(const Image *image)
 %
 %  A description of each parameter follows:
 %
 %    o image: the image.
 %
 */
-MagickExport const CacheType GetImagePixelCacheType(const Image *image)
+MagickExport CacheType GetImagePixelCacheType(const Image *image)
 {
-  CacheInfo
-    *cache_info;
-
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
-  assert(image->cache != (Cache) NULL);
-  cache_info=(CacheInfo *) image->cache;
-  return(cache_info->type);
+  return(GetPixelCacheType(image));
 }
 
 /*
@@ -2729,7 +2725,7 @@ MagickPrivate void GetPixelCacheTileSize(const Image *image,size_t *width,
 %    o image: the image.
 %
 */
-MagickPrivate CacheType GetPixelCacheType(const Image *image)
+static CacheType GetPixelCacheType(const Image *image)
 {
   CacheInfo
     *cache_info;
diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index b1aa78ead..4e3c92fe1 100644
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -33,7 +33,7 @@ typedef enum
   PingCache
 } CacheType;
 
-extern MagickExport const CacheType
+extern MagickExport CacheType
   GetImagePixelCacheType(const Image *);
 
 extern MagickExport const Quantum