...

diff --git a/MagickCore/coder.c b/MagickCore/coder.c
index 0b55c88cef5e2277c4e9f7d562cb3cea45d7e046..40bc475e6024977ea62e7d3f159535564b5be91e 100644 (file)
--- a/MagickCore/coder.c
+++ b/MagickCore/coder.c
@@ -919,7 +919,8 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *cache,const char *xml,
       }
     if (coder_info == (CoderInfo *) NULL)
       continue;
-    if (LocaleCompare(keyword,"/>") == 0)
+    if ((LocaleCompare(keyword,"/>") == 0) ||
+        (LocaleCompare(keyword,"</policy>") == 0))
       {
         status=AddValueToSplayTree(cache,ConstantString(coder_info->magick),
           coder_info);

diff --git a/MagickCore/color.c b/MagickCore/color.c
index b867f774b67f751b75573c75d9b0f119191a48c1..1a44f0b3a022e276a90ebcc1665afe5202facc83 100644 (file)
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -2111,7 +2111,8 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *cache,const char *xml,
       }
     if (color_info == (ColorInfo *) NULL)
       continue;
-    if (LocaleCompare(keyword,"/>") == 0)
+    if ((LocaleCompare(keyword,"/>") == 0) ||
+        (LocaleCompare(keyword,"</policy>") == 0))
       {
         status=AppendValueToLinkedList(cache,color_info);
         if (status == MagickFalse)

diff --git a/MagickCore/configure.c b/MagickCore/configure.c
index 9799049d0fab760f675ea52c1b3c99e202603b74..0eece799d2ad802fa5e475f97b55cd9e3d77f02a 100644 (file)
--- a/MagickCore/configure.c
+++ b/MagickCore/configure.c
@@ -1258,7 +1258,8 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *cache,
       }
     if (configure_info == (ConfigureInfo *) NULL)
       continue;
-    if (LocaleCompare(keyword,"/>") == 0)
+    if ((LocaleCompare(keyword,"/>") == 0) ||
+        (LocaleCompare(keyword,"</policy>") == 0))
       {
         status=AppendValueToLinkedList(cache,configure_info);
         if (status == MagickFalse)

diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c
index e0e5316be86c707dc0052771f0ac2d99f6735b12..df9c3ec79bc504c9aa81af068fc14b936fed6952 100644 (file)
--- a/MagickCore/delegate.c
+++ b/MagickCore/delegate.c
@@ -2107,7 +2107,8 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *cache,
       }
     if (delegate_info == (DelegateInfo *) NULL)
       continue;
-    if (LocaleCompare(keyword,"/>") == 0)
+    if ((LocaleCompare(keyword,"/>") == 0) ||
+        (LocaleCompare(keyword,"</policy>") == 0))
       {
         status=AppendValueToLinkedList(cache,delegate_info);
         if (status == MagickFalse)

diff --git a/MagickCore/magic.c b/MagickCore/magic.c
index 40cefea3e4406683e1b73f1e08c52fb3937972eb..0cb69c40577f59047f3bc2c8a11fc97478650693 100644 (file)
--- a/MagickCore/magic.c
+++ b/MagickCore/magic.c
@@ -942,7 +942,8 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *cache,const char *xml,
       }
     if (magic_info == (MagicInfo *) NULL)
       continue;
-    if (LocaleCompare(keyword,"/>") == 0)
+    if ((LocaleCompare(keyword,"/>") == 0) ||
+        (LocaleCompare(keyword,"</policy>") == 0))
       {
         status=InsertValueInSortedLinkedList(cache,CompareMagickInfoSize,
           NULL,magic_info);

diff --git a/MagickCore/policy.c b/MagickCore/policy.c
index 680b51dc59633060a40bb7117f91f27858a60108..433cf85ec63d360bdb9360c62f002a671f3f7cdc 100644 (file)
--- a/MagickCore/policy.c
+++ b/MagickCore/policy.c
@@ -853,7 +853,8 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *cache,const char *xml,
       }
     if (policy_info == (PolicyInfo *) NULL)
       continue;
-    if (LocaleCompare(keyword,"/>") == 0)
+    if ((LocaleCompare(keyword,"/>") == 0) ||
+        (LocaleCompare(keyword,"</policy>") == 0))
       {
         status=AppendValueToLinkedList(cache,policy_info);
         if (status == MagickFalse)

diff --git a/MagickCore/type.c b/MagickCore/type.c
index f4f0440a71e806abf2b8ad88171ca81a329a3b9c..3420f7fd3c6b1dbbdb4a27688f41026810a58830 100644 (file)
--- a/MagickCore/type.c
+++ b/MagickCore/type.c
@@ -1195,7 +1195,8 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *cache,const char *xml,
       }
     if (type_info == (TypeInfo *) NULL)
       continue;
-    if (LocaleCompare(keyword,"/>") == 0)
+    if ((LocaleCompare(keyword,"/>") == 0) ||
+        (LocaleCompare(keyword,"</policy>") == 0))
       {
         status=AddValueToSplayTree(cache,type_info->name,type_info);
         if (status == MagickFalse)