(no commit message)

diff --git a/MagickCore/splay-tree.c b/MagickCore/splay-tree.c
index be7585b00129fff6d7a4db27d0bf004ebc2832e2..4b0fc6e433f35b25a1c4470a608961bc287fd826 100644 (file)
--- a/MagickCore/splay-tree.c
+++ b/MagickCore/splay-tree.c
@@ -242,7 +242,7 @@ MagickExport MagickBooleanType AddValueToSplayTree(SplayTreeInfo *splay_tree,
 %
 */
 
-static NodeInfo *LinkSplayTreeNodes(NodeInfo **nodes,const size_t low,
+static inline NodeInfo *LinkSplayTreeNodes(NodeInfo **nodes,const size_t low,
   const size_t high)
 {
   register NodeInfo
@@ -264,7 +264,7 @@ static NodeInfo *LinkSplayTreeNodes(NodeInfo **nodes,const size_t low,
   return(node);
 }
 
-static int SplayTreeToNodeArray(NodeInfo *node,const void *nodes)
+static inline int SplayTreeToNodeArray(NodeInfo *node,const void *nodes)
 {
   register const NodeInfo
     ***p;
@@ -275,7 +275,7 @@ static int SplayTreeToNodeArray(NodeInfo *node,const void *nodes)
   return(0);
 }
 
-static void BalanceSplayTree(SplayTreeInfo *splay_tree)
+static inline void BalanceSplayTree(SplayTreeInfo *splay_tree)
 {
   NodeInfo
     **node,
@@ -328,7 +328,7 @@ static void BalanceSplayTree(SplayTreeInfo *splay_tree)
 %
 */
 
-static void *GetFirstSplayTreeNode(SplayTreeInfo *splay_tree)
+static inline void *GetFirstSplayTreeNode(SplayTreeInfo *splay_tree)
 {
   register NodeInfo
     *node;
@@ -967,7 +967,7 @@ MagickExport size_t GetNumberOfNodesInSplayTree(
 %    o value: the value.
 %
 */
-static int IterateOverSplayTree(SplayTreeInfo *splay_tree,
+static inline int IterateOverSplayTree(SplayTreeInfo *splay_tree,
   int (*method)(NodeInfo *,const void *),const void *value)
 {
   typedef enum
@@ -1471,7 +1471,7 @@ MagickExport void ResetSplayTreeIterator(SplayTreeInfo *splay_tree)
 %
 */
 
-static NodeInfo *Splay(SplayTreeInfo *splay_tree,const size_t depth,
+static inline NodeInfo *Splay(SplayTreeInfo *splay_tree,const size_t depth,
   const void *key,NodeInfo **node,NodeInfo **parent,NodeInfo **grandparent)
 {
   int
@@ -1562,7 +1562,7 @@ static NodeInfo *Splay(SplayTreeInfo *splay_tree,const size_t depth,
   return(n);
 }
 
-static void SplaySplayTree(SplayTreeInfo *splay_tree,const void *key)
+static inline void SplaySplayTree(SplayTreeInfo *splay_tree,const void *key)
 {
   if (splay_tree->root == (NodeInfo *) NULL)
     return;

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 0bcfbbdac623e3606a6a3d8279a7924051ff809b..91c0b70f6ebb8811237922b1141ca63c79f2c97a 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "11838:11906"
+#define MagickSVNRevision  "11949:11963M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  1
 #define MagickLibMinInterface  1
-#define MagickReleaseDate  "2013-04-18"
+#define MagickReleaseDate  "2013-04-23"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"