% MagickCore Self-adjusting Binary Search Tree Methods %
% %
% Software Design %
-% John Cristy %
+% Cristy %
% December 2002 %
% %
% %
-% Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
return(0);
}
-static inline void BalanceSplayTree(SplayTreeInfo *splay_tree)
+static void BalanceSplayTree(SplayTreeInfo *splay_tree)
{
NodeInfo
**node,
if (nodes == (NodeInfo **) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
node=nodes;
- (void) IterateOverSplayTree(splay_tree,SplayTreeToNodeArray,
- (const void *) &node);
+ (void) IterateOverSplayTree(splay_tree,SplayTreeToNodeArray,(const void *)
+ &node);
splay_tree->root=LinkSplayTreeNodes(nodes,0,splay_tree->nodes-1);
splay_tree->balance=MagickFalse;
nodes=(NodeInfo **) RelinquishMagickMemory(nodes);
}
splay_tree->signature=(~MagickSignature);
UnlockSemaphoreInfo(splay_tree->semaphore);
- DestroySemaphoreInfo(&splay_tree->semaphore);
+ RelinquishSemaphoreInfo(&splay_tree->semaphore);
splay_tree=(SplayTreeInfo *) RelinquishMagickMemory(splay_tree);
return(splay_tree);
}
splay_tree->next=(void *) NULL;
splay_tree->nodes=0;
splay_tree->debug=IsEventLogging();
- splay_tree->semaphore=AllocateSemaphoreInfo();
+ splay_tree->semaphore=AcquireSemaphoreInfo();
splay_tree->signature=MagickSignature;
return(splay_tree);
}