(no commit message)

diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
index 54354e2d38a5f3dafc4753d047b1a27574294d32..ad35bae8d68312d3f558bd4e7d906fcd96e6b949 100644 (file)
--- a/MagickCore/Makefile.am
+++ b/MagickCore/Makefile.am
@@ -262,6 +262,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/widget-private.h \
        MagickCore/xml-tree.c \
        MagickCore/xml-tree.h \
+       MagickCore/xml-tree-private.h \
        MagickCore/xwindow.c \
        MagickCore/xwindow.h 
 
@@ -432,6 +433,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/utility-private.h \
        MagickCore/vms.h \
        MagickCore/widget-private.h \
+       MagickCore/xml-tree-private.h \
        MagickCore/xwindow-private.h
 
 MAGICKCORE_EXTRA_DIST = \

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index fe3079ad84521ff26caf339d7c1cdbf2f16571aa..b985258d88f67350c0e48611f6f4a84b646d857e 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -73,6 +73,7 @@
 #include "MagickCore/thread-private.h"
 #include "MagickCore/token.h"
 #include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickCore/mime.c b/MagickCore/mime.c
index 4fa6b47f190421918063c54f93947e3862c6ee3b..d0e0e4584c89b737a4acc3caf9a6a7f1e52aec94 100644 (file)
--- a/MagickCore/mime.c
+++ b/MagickCore/mime.c
@@ -54,6 +54,7 @@
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
 #include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
 \f
 /*
   Define declarations.

diff --git a/MagickCore/morphology-private.h b/MagickCore/morphology-private.h
index 819729a252621338fef7848c609a111057f40369..6469e9da0501897b1143f809f715300aa411c571 100644 (file)
--- a/MagickCore/morphology-private.h
+++ b/MagickCore/morphology-private.h
@@ -33,6 +33,7 @@ extern MagickPrivate Image
     const KernelInfo *,const CompositeOperator,const double,ExceptionInfo *);
 
 extern MagickPrivate void
+  ShowKernelInfo(const KernelInfo *),
   ZeroKernelNans(KernelInfo *);
 
 #endif

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index f3c98311ff041184b9feb555743ed5b93cb25428..f8a6297834a82ea3b4e1b33fe3aca155b5f8576e 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -4711,7 +4711,7 @@ MagickExport void ScaleKernelInfo(KernelInfo *kernel,
 %    o kernel: the Morphology/Convolution kernel
 %
 */
-MagickExport void ShowKernelInfo(const KernelInfo *kernel)
+MagickPrivate void ShowKernelInfo(const KernelInfo *kernel)
 {
   const KernelInfo
     *k;

diff --git a/MagickCore/morphology.h b/MagickCore/morphology.h
index cfd6d4c78d8e2d1ad51a57b60c050eec773a58c8..b17526f10c6f2f7833725f66e92c3055d2fde0ec 100644 (file)
--- a/MagickCore/morphology.h
+++ b/MagickCore/morphology.h
@@ -139,7 +139,6 @@ extern MagickExport Image
 extern MagickExport void
   ScaleGeometryKernelInfo(KernelInfo *,const char *),
   ScaleKernelInfo(KernelInfo *,const double,const GeometryFlags),
-  ShowKernelInfo(const KernelInfo *),
   UnityAddKernelInfo(KernelInfo *,const double);
 
 #if defined(__cplusplus) || defined(c_plusplus)

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 90dce9469401feb85f42361c353717aca14bedba..f157ecf2222c908ac4013da5e651631f74fc944c 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -78,6 +78,7 @@
 #include "MagickCore/utility-private.h"
 #include "MagickCore/version.h"
 #include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index d407783358203b719e129b41c2fd940de6ec5eae..4c73de713f194912f021c6a9614c97b1853fb8e4 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -83,6 +83,7 @@
 #include "MagickCore/threshold.h"
 #include "MagickCore/transform.h"
 #include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
 \f
 /*
   Define declarations.

diff --git a/MagickCore/xml-tree-private.h b/MagickCore/xml-tree-private.h
new file mode 100644 (file)
index 0000000..b4c1b42
--- /dev/null
+++ b/MagickCore/xml-tree-private.h
@@ -0,0 +1,52 @@
+/*
+  Copyright 1999-2011 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.
+  obtain a copy of the License at
+
+    http://www.imagemagick.org/MagicksToolkit/script/license.php
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  MagickCore private xml-tree methods.
+*/
+#ifndef _MAGICKCORE_XML_TREE_PRIVATE_H
+#define _MAGICKCORE_XML_TREE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include <MagickCore/exception.h>
+#include <MagickCore/splay-tree.h>
+
+extern MagickPrivate char
+  *CanonicalXMLContent(const char *,const MagickBooleanType);
+
+extern MagickPrivate const char
+  *GetXMLTreeAttribute(XMLTreeInfo *,const char *),
+  **GetXMLTreeProcessingInstructions(XMLTreeInfo *,const char *);
+
+extern MagickPrivate MagickBooleanType
+  GetXMLTreeAttributes(const XMLTreeInfo *,SplayTreeInfo *);
+
+extern MagickPrivate XMLTreeInfo
+  *AddPathToXMLTree(XMLTreeInfo *,const char *,const size_t),
+  *GetNextXMLTreeTag(XMLTreeInfo *),
+  *GetXMLTreeOrdered(XMLTreeInfo *),
+  *GetXMLTreePath(XMLTreeInfo *,const char *),
+  *InsertTagIntoXMLTree(XMLTreeInfo *,XMLTreeInfo *,const size_t),
+  *ParseTagFromXMLTree(XMLTreeInfo *),
+  *PruneTagFromXMLTree(XMLTreeInfo *),
+  *SetXMLTreeAttribute(XMLTreeInfo *,const char *,const char *);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif

diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 8baa482c64cc43560e2973715c805674f2beb774..14492efa2d89bd4fce9ff548463d0d2061b12dba 100644 (file)
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -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
@@ -549,7 +550,7 @@ MagickExport XMLTreeInfo *DestroyXMLTree(XMLTreeInfo *xml_info)
 %    o xml_info: the xml info.
 %
 */
-MagickExport XMLTreeInfo *GetNextXMLTreeTag(XMLTreeInfo *xml_info)
+MagickPrivate XMLTreeInfo *GetNextXMLTreeTag(XMLTreeInfo *xml_info)
 {
   assert(xml_info != (XMLTreeInfo *) NULL);
   assert((xml_info->signature == MagickSignature) ||
@@ -583,7 +584,7 @@ MagickExport XMLTreeInfo *GetNextXMLTreeTag(XMLTreeInfo *xml_info)
 %    o tag: the attribute tag.
 %
 */
-MagickExport const char *GetXMLTreeAttribute(XMLTreeInfo *xml_info,
+MagickPrivate const char *GetXMLTreeAttribute(XMLTreeInfo *xml_info,
   const char *tag)
 {
   register ssize_t
@@ -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
@@ -2132,7 +2133,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 +2206,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

diff --git a/MagickCore/xml-tree.h b/MagickCore/xml-tree.h
index 64a4053159d2f1a2abfa6698bfc9a7351d33f5a1..0c5fdfbdf3c77c46944ed6c26f69e23e7d359f75 100644 (file)
--- a/MagickCore/xml-tree.h
+++ b/MagickCore/xml-tree.h
@@ -22,40 +22,23 @@
 extern "C" {
 #endif
 
-#include <MagickCore/exception.h>
-#include <MagickCore/splay-tree.h>
-
 typedef struct _XMLTreeInfo
   XMLTreeInfo;
 
 extern MagickExport char
-  *CanonicalXMLContent(const char *,const MagickBooleanType),
   *XMLTreeInfoToXML(XMLTreeInfo *);
 
 extern MagickExport const char
-  *GetXMLTreeAttribute(XMLTreeInfo *,const char *),
   *GetXMLTreeContent(XMLTreeInfo *),
-  **GetXMLTreeProcessingInstructions(XMLTreeInfo *,const char *),
   *GetXMLTreeTag(XMLTreeInfo *);
 
-extern MagickExport MagickBooleanType
-  GetXMLTreeAttributes(const XMLTreeInfo *,SplayTreeInfo *);
-
 extern MagickExport XMLTreeInfo
   *AddChildToXMLTree(XMLTreeInfo *,const char *,const size_t),
-  *AddPathToXMLTree(XMLTreeInfo *,const char *,const size_t),
   *DestroyXMLTree(XMLTreeInfo *),
-  *GetNextXMLTreeTag(XMLTreeInfo *),
   *GetXMLTreeChild(XMLTreeInfo *,const char *),
-  *GetXMLTreeOrdered(XMLTreeInfo *),
-  *GetXMLTreePath(XMLTreeInfo *,const char *),
   *GetXMLTreeSibling(XMLTreeInfo *),
-  *InsertTagIntoXMLTree(XMLTreeInfo *,XMLTreeInfo *,const size_t),
   *NewXMLTree(const char *,ExceptionInfo *),
   *NewXMLTreeTag(const char *),
-  *ParseTagFromXMLTree(XMLTreeInfo *),
-  *PruneTagFromXMLTree(XMLTreeInfo *),
-  *SetXMLTreeAttribute(XMLTreeInfo *,const char *,const char *),
   *SetXMLTreeContent(XMLTreeInfo *,const char *);
 
 #if defined(__cplusplus) || defined(c_plusplus)

diff --git a/Makefile.in b/Makefile.in
index 10f99cfd32747131b6975b7f9fa4c76d0a2a7e3c..29d5317bcd691148825109f5e8bdf95359e84e2b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -467,38 +467,38 @@ am__MagickCore_libMagickCore_la_SOURCES_DIST =  \
        MagickCore/version.h MagickCore/vms.h MagickCore/widget.c \
        MagickCore/widget.h MagickCore/widget-private.h \
        MagickCore/xml-tree.c MagickCore/xml-tree.h \
-       MagickCore/xwindow.c MagickCore/xwindow.h \
-       MagickCore/nt-feature.c MagickCore/nt-base.c coders/aai.c \
-       coders/art.c coders/avs.c coders/bgr.c coders/bmp.c \
-       coders/braille.c coders/cals.c coders/caption.c coders/cin.c \
-       coders/cip.c coders/clip.c coders/cmyk.c coders/cut.c \
-       coders/dcm.c coders/dds.c coders/debug.c coders/dib.c \
-       coders/dng.c coders/dot.c coders/dpx.c coders/fax.c \
-       coders/fits.c coders/gif.c coders/gradient.c coders/gray.c \
-       coders/hald.c coders/hdr.c coders/histogram.c coders/hrz.c \
-       coders/html.c coders/icon.c coders/info.c coders/inline.c \
-       coders/ipl.c coders/label.c coders/mac.c coders/magick.c \
-       coders/map.c coders/mat.c coders/matte.c coders/meta.c \
-       coders/miff.c coders/mono.c coders/mpc.c coders/mpeg.c \
-       coders/mpr.c coders/msl.c coders/mtv.c coders/mvg.c \
-       coders/null.c coders/otb.c coders/palm.c coders/pattern.c \
-       coders/pcd.c coders/pcl.c coders/pcx.c coders/pdb.c \
-       coders/pdf.c coders/pes.c coders/pict.c coders/pix.c \
-       coders/plasma.c coders/pnm.c coders/preview.c coders/ps.c \
-       coders/ps2.c coders/ps3.c coders/psd.c coders/pwp.c \
-       coders/raw.c coders/rgb.c coders/rla.c coders/rle.c \
-       coders/scr.c coders/sct.c coders/sfw.c coders/sgi.c \
-       coders/stegano.c coders/sun.c coders/svg.c coders/tga.c \
-       coders/thumbnail.c coders/tile.c coders/tim.c coders/ttf.c \
-       coders/txt.c coders/uil.c coders/url.c coders/uyvy.c \
-       coders/vicar.c coders/vid.c coders/viff.c coders/wbmp.c \
-       coders/wpg.c coders/xbm.c coders/xc.c coders/xcf.c \
-       coders/xpm.c coders/xps.c coders/ycbcr.c coders/yuv.c \
-       coders/dps.c coders/djvu.c coders/exr.c coders/fpx.c \
-       coders/clipboard.c coders/emf.c coders/jbig.c coders/jpeg.c \
-       coders/jp2.c coders/png.c coders/ept.c coders/tiff.c \
-       coders/webp.c coders/wmf.c coders/x.c coders/xwd.c \
-       filters/analyze.c
+       MagickCore/xml-tree-private.h MagickCore/xwindow.c \
+       MagickCore/xwindow.h MagickCore/nt-feature.c \
+       MagickCore/nt-base.c coders/aai.c coders/art.c coders/avs.c \
+       coders/bgr.c coders/bmp.c coders/braille.c coders/cals.c \
+       coders/caption.c coders/cin.c coders/cip.c coders/clip.c \
+       coders/cmyk.c coders/cut.c coders/dcm.c coders/dds.c \
+       coders/debug.c coders/dib.c coders/dng.c coders/dot.c \
+       coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \
+       coders/gradient.c coders/gray.c coders/hald.c coders/hdr.c \
+       coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \
+       coders/info.c coders/inline.c coders/ipl.c coders/label.c \
+       coders/mac.c coders/magick.c coders/map.c coders/mat.c \
+       coders/matte.c coders/meta.c coders/miff.c coders/mono.c \
+       coders/mpc.c coders/mpeg.c coders/mpr.c coders/msl.c \
+       coders/mtv.c coders/mvg.c coders/null.c coders/otb.c \
+       coders/palm.c coders/pattern.c coders/pcd.c coders/pcl.c \
+       coders/pcx.c coders/pdb.c coders/pdf.c coders/pes.c \
+       coders/pict.c coders/pix.c coders/plasma.c coders/pnm.c \
+       coders/preview.c coders/ps.c coders/ps2.c coders/ps3.c \
+       coders/psd.c coders/pwp.c coders/raw.c coders/rgb.c \
+       coders/rla.c coders/rle.c coders/scr.c coders/sct.c \
+       coders/sfw.c coders/sgi.c coders/stegano.c coders/sun.c \
+       coders/svg.c coders/tga.c coders/thumbnail.c coders/tile.c \
+       coders/tim.c coders/ttf.c coders/txt.c coders/uil.c \
+       coders/url.c coders/uyvy.c coders/vicar.c coders/vid.c \
+       coders/viff.c coders/wbmp.c coders/wpg.c coders/xbm.c \
+       coders/xc.c coders/xcf.c coders/xpm.c coders/xps.c \
+       coders/ycbcr.c coders/yuv.c coders/dps.c coders/djvu.c \
+       coders/exr.c coders/fpx.c coders/clipboard.c coders/emf.c \
+       coders/jbig.c coders/jpeg.c coders/jp2.c coders/png.c \
+       coders/ept.c coders/tiff.c coders/webp.c coders/wmf.c \
+       coders/x.c coders/xwd.c filters/analyze.c
 am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \
        MagickCore/MagickCore_libMagickCore_la-animate.lo \
        MagickCore/MagickCore_libMagickCore_la-annotate.lo \
@@ -4071,6 +4071,7 @@ MAGICKCORE_BASE_SRCS = \
        MagickCore/widget-private.h \
        MagickCore/xml-tree.c \
        MagickCore/xml-tree.h \
+       MagickCore/xml-tree-private.h \
        MagickCore/xwindow.c \
        MagickCore/xwindow.h 
 
@@ -4236,6 +4237,7 @@ MAGICKCORE_NOINST_HDRS = \
        MagickCore/utility-private.h \
        MagickCore/vms.h \
        MagickCore/widget-private.h \
+       MagickCore/xml-tree-private.h \
        MagickCore/xwindow-private.h
 
 MAGICKCORE_EXTRA_DIST = \

diff --git a/coders/dng.c b/coders/dng.c
index 7864121038bd3787e28f480da654f4ed5ef76e81..fc29a69d362779f1663d111da9f850186fa60901 100644 (file)
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -61,6 +61,7 @@
 #include "MagickCore/transform.h"
 #include "MagickCore/utility.h"
 #include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
 \f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/config/configure.xml b/config/configure.xml
index bec136a3f04fa9c265af02584b0e32f3abb0fd5a..55b21527be23ae9d7d6d55b4d37734aceec6cbd2 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="5150" />
-  <configure name="RELEASE_DATE" value="2011-09-03"/>
+  <configure name="RELEASE_DATE" value="2011-09-04"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>