From b781f69d7e3145b2e4890dd386065cd7c6568c2c Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Wed, 9 Jan 2019 07:47:06 +0100
Subject: [PATCH] Moved call to xmlCleanupParser from msl and svg coder to
 MagickCoreTerminus.

---
 MagickCore/magick.c | 11 +++++++++++
 coders/msl.c        |  4 ----
 coders/svg.c        |  4 ----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index 6d9aae5ea..9951a9589 100644
--- 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
 
 /*
   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 37add20a9..28ab8f313 100644
--- 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
 }
 
 #if defined(MAGICKCORE_XML_DELEGATE)
diff --git a/coders/svg.c b/coders/svg.c
index 6eb8dcb0b..60af0dc63 100644
--- 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
 }
 
 /*
-- 
2.40.0