(no commit message)

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index fac96c083415d6f8b3dac04d0b5b5ffcaffa5a88..685594f845a7d43de43bf194b32ab2d7c815494f 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -28,15 +28,6 @@ extern "C" {
 #include "MagickCore/thread-private.h"
 #include "MagickCore/semaphore.h"
 
-typedef enum
-{
-  UndefinedCache,
-  MemoryCache,
-  MapCache,
-  DiskCache,
-  PingCache
-} CacheType;
-
 typedef void
   *Cache;
 

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 017722a439c76ba3134ad3af5e8faac2d9b19da4..050d1880e9ee57c9ef990ba95053972715d15b9f 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1977,6 +1977,41 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
 %                                                                             %
 %                                                                             %
 %                                                                             %
++   G e t I m a g e P i x e l C a c h e T y p e                               %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  GetImagePixelCacheType() returns the pixel cache type: UndefinedCache,
+%  DiskCache, MemoryCache, MapCache, or PingCache.
+%
+%  The format of the GetImagePixelCacheType() method is:
+%
+%      const CacheType GetImagePixelCacheType(const Image *image)
+%
+%  A description of each parameter follows:
+%
+%    o image: the image.
+%
+*/
+MagickExport const 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);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 %   G e t O n e A u t h e n t i c P i x e l                                   %
 %                                                                             %
 %                                                                             %
@@ -3644,41 +3679,6 @@ MagickPrivate const Quantum *GetVirtualPixelsNexus(const Cache cache,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   I s P i x e l C a c h e I n C o r e                                       %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  IsPixelCacheInCore() returns MagickTrue if the pixel cache is memory based
-%  otherwise MagickFalse.
-%
-%  The format of the IsPixelCacheInCore() method is:
-%
-%      MagickBooleanType IsPixelCacheInCore(const Image *image)
-%
-%  A description of each parameter follows:
-%
-%    o image: the image.
-%
-*/
-MagickExport MagickBooleanType IsPixelCacheInCore(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 == DiskCache ? MagickFalse  : MagickTrue);
-}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
 +   O p e n P i x e l C a c h e                                               %
 %                                                                             %
 %                                                                             %

diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index 52fb4dc8d3f0e83677c14c52087fdfeb1c1ba7ec..b1aa78ead43b05bcdd199976d243c2e7b0898a29 100644 (file)
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -24,6 +24,18 @@ extern "C" {
 
 #include "MagickCore/blob.h"
 
+typedef enum
+{
+  UndefinedCache,
+  MemoryCache,
+  MapCache,
+  DiskCache,
+  PingCache
+} CacheType;
+
+extern MagickExport const CacheType
+  GetImagePixelCacheType(const Image *);
+
 extern MagickExport const Quantum
   *GetVirtualPixels(const Image *,const ssize_t,const ssize_t,const size_t,
     const size_t,ExceptionInfo *) magick_hot_spot,
@@ -39,7 +51,6 @@ extern MagickExport MagickBooleanType
     ExceptionInfo *),
   GetOneVirtualPixelInfo(const Image *,const VirtualPixelMethod,
     const ssize_t,const ssize_t,PixelInfo *,ExceptionInfo *),
-  IsPixelCacheInCore(const Image *),
   PersistPixelCache(Image *,const char *,const MagickBooleanType,
     MagickOffsetType *,ExceptionInfo *),
   SyncAuthenticPixels(Image *,ExceptionInfo *) magick_hot_spot;

diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h
index dbe3848388a620a00793039008513e4c58075dc8..7a109d4beaf83ef1d6e6a8836f929d58bf06b459 100644 (file)
--- a/MagickCore/thread-private.h
+++ b/MagickCore/thread-private.h
@@ -34,7 +34,8 @@ extern "C" {
   if (((((columns) > WorkloadThreshold()) || \
       ((rows) > WorkloadThreshold()))) && ((MagickSizeType) \
       ((columns)*(rows)) > (WorkloadThreshold()*WorkloadThreshold())) && \
-      (IsPixelCacheInCore(image) != MagickFalse) && (expression)) \
+      ((GetImagePixelCacheType(image) == MemoryCache) || \
+       (GetImagePixelCacheType(image) == MapCache)) && (expression)) \
     num_threads(GetMagickResourceLimit(ThreadResource))
 
 #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR > 10))