Add RobidouxSharp filter depreciate Bessel Filter and Static Gravity

[imagemagick] / MagickCore / xml-tree.c

diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 8baa482c64cc43560e2973715c805674f2beb774..2f1b4a25c99c52e1e35ef3c7cc14504ae6ee415c 100644 (file)
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -23,7 +23,7 @@
 %                               December 2004                                 %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2012 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  %
@@ -58,6 +58,7 @@
 #include "MagickCore/string-private.h"
 #include "MagickCore/token-private.h"
 #include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
 \f
@@ -208,7 +209,7 @@ MagickExport XMLTreeInfo *AddChildToXMLTree(XMLTreeInfo *xml_info,
 %    o offset: the tag offset.
 %
 */
-MagickExport XMLTreeInfo *AddPathToXMLTree(XMLTreeInfo *xml_info,
+MagickPrivate XMLTreeInfo *AddPathToXMLTree(XMLTreeInfo *xml_info,
   const char *path,const size_t offset)
 {
   char
@@ -292,7 +293,7 @@ MagickExport XMLTreeInfo *AddPathToXMLTree(XMLTreeInfo *xml_info,
 %      entities.
 %
 */
-MagickExport char *CanonicalXMLContent(const char *content,
+MagickPrivate char *CanonicalXMLContent(const char *content,
   const MagickBooleanType pedantic)
 {
   char
@@ -651,7 +652,7 @@ MagickExport const char *GetXMLTreeAttribute(XMLTreeInfo *xml_info,
 %    o attributes: the attribute splay-tree.
 %
 */
-MagickExport MagickBooleanType GetXMLTreeAttributes(const XMLTreeInfo *xml_info,
+MagickPrivate MagickBooleanType GetXMLTreeAttributes(const XMLTreeInfo *xml_info,
   SplayTreeInfo *attributes)
 {
   register ssize_t
@@ -768,7 +769,7 @@ MagickExport const char *GetXMLTreeContent(XMLTreeInfo *xml_info)
 %    o xml_info: the xml info.
 %
 */
-MagickExport XMLTreeInfo *GetXMLTreeOrdered(XMLTreeInfo *xml_info)
+MagickPrivate XMLTreeInfo *GetXMLTreeOrdered(XMLTreeInfo *xml_info)
 {
   assert(xml_info != (XMLTreeInfo *) NULL);
   assert((xml_info->signature == MagickSignature) ||
@@ -802,7 +803,7 @@ MagickExport XMLTreeInfo *GetXMLTreeOrdered(XMLTreeInfo *xml_info)
 %    o path: the path (e.g. property/elapsed-time).
 %
 */
-MagickExport XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info,const char *path)
+MagickPrivate XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info,const char *path)
 {
   char
     **components,
@@ -876,7 +877,7 @@ MagickExport XMLTreeInfo *GetXMLTreePath(XMLTreeInfo *xml_info,const char *path)
 %    o xml_info: the xml info.
 %
 */
-MagickExport const char **GetXMLTreeProcessingInstructions(
+MagickPrivate const char **GetXMLTreeProcessingInstructions(
   XMLTreeInfo *xml_info,const char *target)
 {
   register ssize_t
@@ -991,7 +992,7 @@ MagickExport const char *GetXMLTreeTag(XMLTreeInfo *xml_info)
 %    o offset: the tag offset.
 %
 */
-MagickExport XMLTreeInfo *InsertTagIntoXMLTree(XMLTreeInfo *xml_info,
+MagickPrivate XMLTreeInfo *InsertTagIntoXMLTree(XMLTreeInfo *xml_info,
   XMLTreeInfo *child,const size_t offset)
 {
   XMLTreeInfo
@@ -1767,8 +1768,9 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
   {
     attributes=(char **) sentinel;
     tag=p;
+    c=(*p);
     if ((isalpha((int) ((unsigned char) *p)) !=0) || (*p == '_') ||
-        (*p == ':') || (((int) *p) < '\0'))
+        (*p == ':') || (c < '\0'))
       {
         /*
           Tag.
@@ -1807,7 +1809,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
           if (attributes == (char **) NULL)
             {
               (void) ThrowMagickException(exception,GetMagickModule(),
-                ResourceLimitError,"MemoryAllocationFailed","`%s'","");
+                ResourceLimitError,"MemoryAllocationFailed","'%s'","");
               utf8=DestroyString(utf8);
               return(&root->root);
             }
@@ -2049,7 +2051,7 @@ MagickExport XMLTreeInfo *NewXMLTree(const char *xml,ExceptionInfo *exception)
       return(&root->root);
     }
   (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning,
-    "ParseError","unclosed tag: `%s'",root->node->tag);
+    "ParseError","unclosed tag: '%s'",root->node->tag);
   return(&root->root);
 }
 \f
@@ -2132,7 +2134,7 @@ MagickExport XMLTreeInfo *NewXMLTreeTag(const char *tag)
 %    o xml_info: the xml info.
 %
 */
-MagickExport XMLTreeInfo *PruneTagFromXMLTree(XMLTreeInfo *xml_info)
+MagickPrivate XMLTreeInfo *PruneTagFromXMLTree(XMLTreeInfo *xml_info)
 {
   XMLTreeInfo
     *node;
@@ -2205,7 +2207,7 @@ MagickExport XMLTreeInfo *PruneTagFromXMLTree(XMLTreeInfo *xml_info)
 %    o value:  The attribute value.
 %
 */
-MagickExport XMLTreeInfo *SetXMLTreeAttribute(XMLTreeInfo *xml_info,
+MagickPrivate XMLTreeInfo *SetXMLTreeAttribute(XMLTreeInfo *xml_info,
   const char *tag,const char *value)
 {
   register ssize_t