Moved call to xmlCleanupParser from msl and svg coder to MagickCoreTerminus.

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 6d9aae5ea9c59a3433934a64e8d7e13a78955398..9951a95892fbf1aefe69bcc075ac02c25026e65a 100644 (file)
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -91,6 +91,14 @@
 #include "MagickCore/utility.h"
 #include "MagickCore/utility-private.h"
 #include "MagickCore/xwindow-private.h"
+#if defined(MAGICKCORE_XML_DELEGATE)
+#  if defined(MAGICKCORE_WINDOWS_SUPPORT)
+#    if !defined(__MINGW32__)
+#      include <win32config.h>
+#    endif
+#  endif
+#  include <libxml/parser.h>
+#endif
 \f
 /*
   Define declarations.
@@ -1562,6 +1570,9 @@ MagickExport void MagickCoreTerminus(void)
   RegistryComponentTerminus();
 #if defined(MAGICKCORE_X11_DELEGATE)
   XComponentTerminus();
+#endif
+#if defined(MAGICKCORE_XML_DELEGATE)
+  xmlCleanupParser();
 #endif
   AnnotateComponentTerminus();
   MimeComponentTerminus();

diff --git a/coders/msl.c b/coders/msl.c
index 37add20a9db58d87ec4e8cb6ac6222a0c9cec69b..28ab8f313b80d330a6d4dc6ebd0050ece950ba70 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -98,7 +98,6 @@
 #      include <win32config.h>
 #    endif
 #  endif
-#  include <libxml/parser.h>
 #  include <libxml/xmlmemory.h>
 #  include <libxml/parserInternals.h>
 #  include <libxml/xmlerror.h>
@@ -8311,9 +8310,6 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
 ModuleExport void UnregisterMSLImage(void)
 {
   (void) UnregisterMagickInfo("MSL");
-#if defined(MAGICKCORE_XML_DELEGATE)
-  xmlCleanupParser();
-#endif
 }
 \f
 #if defined(MAGICKCORE_XML_DELEGATE)

diff --git a/coders/svg.c b/coders/svg.c
index 6eb8dcb0b00ce697c206ca4cbf4e82f18edae4ba..60af0dc63be784ae80f0a65bc600eb491aedc705 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -80,7 +80,6 @@
 #      include <win32config.h>
 #    endif
 #  endif
-#  include <libxml/parser.h>
 #  include <libxml/xmlmemory.h>
 #  include <libxml/parserInternals.h>
 #  include <libxml/xmlerror.h>
@@ -3750,9 +3749,6 @@ ModuleExport void UnregisterSVGImage(void)
   (void) UnregisterMagickInfo("SVGZ");
   (void) UnregisterMagickInfo("SVG");
   (void) UnregisterMagickInfo("MSVG");
-#if defined(MAGICKCORE_XML_DELEGATE)
-  xmlCleanupParser();
-#endif
 }
 \f
 /*