diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h index 685594f845..71d6768084 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 050d1880e9..2c9157a4e1 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 b1aa78ead4..4e3c92fe1c 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