(no commit message)

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index 2e3376e68547cb8cf741e8c7ad868e3c0bf45c2d..d260d137329df2c5a8e60a38aced2add06333ba0 100644 (file)
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -149,13 +149,13 @@ extern "C" {
 #if defined(MAGICKCORE_HAVE___ALLOC_SIZE__)
 #  define magick_alloc_size(x)  __attribute__((__alloc_size__(x)))
 #  define magick_alloc_sizes(x,y)  __attribute__((__alloc_size__(x,y)))
-#  define magick_cold  __attribute__((__cold__))
-#  define magick_hot  __attribute__((__hot__))
+#  define magick_cold_spot  __attribute__((__cold__))
+#  define magick_hot_spot  __attribute__((__hot__))
 #else
 #  define magick_alloc_size(x)  /* nothing */
 #  define magick_alloc_sizes(x,y)  /* nothing */
-#  define magick_cold
-#  define magick_hot
+#  define magick_cold_spot
+#  define magick_hot_spot
 #endif
 
 #if defined(MAGICKCORE_NAMESPACE_PREFIX)

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index 9cb0379b10053c8c72efbdef89e214f994aa7a56..8f9ac6cda1aab3cb9b253b79e6b42004cf887df8 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -217,7 +217,7 @@ extern MagickPrivate ColorspaceType
 extern MagickPrivate const Quantum
   *GetVirtualPixelsFromNexus(const Image *,const VirtualPixelMethod,
     const ssize_t,const ssize_t,const size_t,const size_t,NexusInfo *,
-    ExceptionInfo *),
+    ExceptionInfo *) magick_hot_spot,
   *GetVirtualPixelsNexus(const Cache,NexusInfo *);
 
 extern MagickPrivate const void
@@ -226,7 +226,7 @@ extern MagickPrivate const void
 
 extern MagickPrivate MagickBooleanType
   CacheComponentGenesis(void),
-  SyncAuthenticPixelCacheNexus(Image *,NexusInfo *,ExceptionInfo *),
+  SyncAuthenticPixelCacheNexus(Image *,NexusInfo *,ExceptionInfo *) magick_hot_spot,
   SyncImagePixelCache(Image *,ExceptionInfo *);
 
 extern MagickPrivate MagickSizeType
@@ -238,11 +238,11 @@ extern MagickPrivate NexusInfo
 
 extern MagickPrivate Quantum
   *GetAuthenticPixelCacheNexus(Image *,const ssize_t,const ssize_t,
-    const size_t,const size_t,NexusInfo *,ExceptionInfo *),
+    const size_t,const size_t,NexusInfo *,ExceptionInfo *) magick_hot_spot,
   *GetPixelCacheNexusPixels(const Cache,NexusInfo *),
   *QueueAuthenticPixelCacheNexus(Image *,const ssize_t,const ssize_t,
     const size_t,const size_t,const MagickBooleanType,NexusInfo *,
-    ExceptionInfo *);
+    ExceptionInfo *) magick_hot_spot;
 
 extern MagickPrivate size_t
   GetPixelCacheChannels(const Cache);
@@ -254,7 +254,7 @@ extern MagickPrivate VirtualPixelMethod
 extern MagickPrivate void
   CacheComponentTerminus(void),
   ClonePixelCacheMethods(Cache,const Cache),
-  *GetPixelCacheNexusMetacontent(const Cache,NexusInfo *),
+  *GetPixelCacheNexusMetacontent(const Cache,NexusInfo *) magick_hot_spot,
   *GetPixelCachePixels(Image *,MagickSizeType *,ExceptionInfo *),
   GetPixelCacheTileSize(const Image *,size_t *,size_t *),
   GetPixelCacheMethods(CacheMethods *),

diff --git a/MagickCore/cache-view.h b/MagickCore/cache-view.h
index d38a15760c4b5f17dd88658176058dc64ea4e917..a3782d361f3b3c4750707cce1c036440fb3b1643 100644 (file)
--- a/MagickCore/cache-view.h
+++ b/MagickCore/cache-view.h
@@ -61,8 +61,8 @@ extern MagickExport ColorspaceType
 
 extern MagickExport const Quantum
   *GetCacheViewVirtualPixels(const CacheView *,const ssize_t,const ssize_t,
-    const size_t,const size_t,ExceptionInfo *),
-  *GetCacheViewVirtualPixelQueue(const CacheView *);
+    const size_t,const size_t,ExceptionInfo *) magick_hot_spot,
+  *GetCacheViewVirtualPixelQueue(const CacheView *) magick_hot_spot;
 
 extern MagickExport const void
   *GetCacheViewVirtualMetacontent(const CacheView *);
@@ -76,17 +76,17 @@ extern MagickExport MagickBooleanType
     Quantum *,ExceptionInfo *),
   SetCacheViewStorageClass(CacheView *,const ClassType,ExceptionInfo *),
   SetCacheViewVirtualPixelMethod(CacheView *,const VirtualPixelMethod),
-  SyncCacheViewAuthenticPixels(CacheView *,ExceptionInfo *);
+  SyncCacheViewAuthenticPixels(CacheView *,ExceptionInfo *) magick_hot_spot;
 
 extern MagickExport MagickSizeType
   GetCacheViewExtent(const CacheView *);
 
 extern MagickExport Quantum
-  *GetCacheViewAuthenticPixelQueue(CacheView *),
+  *GetCacheViewAuthenticPixelQueue(CacheView *) magick_hot_spot,
   *GetCacheViewAuthenticPixels(CacheView *,const ssize_t,const ssize_t,
-    const size_t,const size_t,ExceptionInfo *),
+    const size_t,const size_t,ExceptionInfo *) magick_hot_spot,
   *QueueCacheViewAuthenticPixels(CacheView *,const ssize_t,const ssize_t,
-    const size_t,const size_t,ExceptionInfo *);
+    const size_t,const size_t,ExceptionInfo *) magick_hot_spot;
 
 extern MagickExport void
   *GetCacheViewAuthenticMetacontent(CacheView *);

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 03b4af4b3d41e6a00662fe13b144a52eb96a649b..906825afc39ace754fecbde63ed1676c8dfd59d6 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -117,6 +117,10 @@ struct _NexusInfo
 extern "C" {
 #endif
 
+static Cache
+  GetImagePixelCache(Image *,const MagickBooleanType,ExceptionInfo *)
+    magick_hot_spot;
+
 static const Quantum
   *GetVirtualPixelCache(const Image *,const VirtualPixelMethod,const ssize_t,
     const ssize_t,const size_t,const size_t,ExceptionInfo *),
@@ -143,7 +147,7 @@ static Quantum
   *QueueAuthenticPixelsCache(Image *,const ssize_t,const ssize_t,const size_t,
     const size_t,ExceptionInfo *),
   *SetPixelCacheNexusPixels(const Image *,const RectangleInfo *,NexusInfo *,
-    ExceptionInfo *);
+    ExceptionInfo *) magick_hot_spot;
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }