From: cristy Date: Tue, 26 May 2015 23:25:11 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~988 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1f115c91f45051a1f34f219158f72aa29ca4696;p=imagemagick --- diff --git a/MagickCore/splay-tree.c b/MagickCore/splay-tree.c index 9965d275a..783dadde6 100644 --- a/MagickCore/splay-tree.c +++ b/MagickCore/splay-tree.c @@ -242,7 +242,7 @@ MagickExport MagickBooleanType AddValueToSplayTree(SplayTreeInfo *splay_tree, % */ -static inline NodeInfo *LinkSplayTreeNodes(NodeInfo **nodes,const size_t low, +static NodeInfo *LinkSplayTreeNodes(NodeInfo **nodes,const size_t low, const size_t high) { register NodeInfo @@ -1471,7 +1471,7 @@ MagickExport void ResetSplayTreeIterator(SplayTreeInfo *splay_tree) % */ -static inline NodeInfo *Splay(SplayTreeInfo *splay_tree,const size_t depth, +static NodeInfo *Splay(SplayTreeInfo *splay_tree,const size_t depth, const void *key,NodeInfo **node,NodeInfo **parent,NodeInfo **grandparent) { int diff --git a/MagickCore/transform.c b/MagickCore/transform.c index c3fee33d3..586a12aee 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -1464,10 +1464,8 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) % */ -static inline MagickBooleanType CopyImageRegion(Image *destination, - const Image *source,const size_t columns,const size_t rows, - const ssize_t sx,const ssize_t sy,const ssize_t dx,const ssize_t dy, - ExceptionInfo *exception) +static MagickBooleanType CopyImageRegion(Image *destination,const Image *source, const size_t columns,const size_t rows,const ssize_t sx,const ssize_t sy, + const ssize_t dx,const ssize_t dy,ExceptionInfo *exception) { CacheView *source_view,