Fixed bug where XmpProfile.FromIXPathNavigable and XmpProfile.FromXDo…

…cument would add a xml declaration (#1652).
dlemstra · Jun 7, 2024 · 4e7a011 · 4e7a011
1 parent b38478d
commit 4e7a011
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/Magick.NET.Core/Profiles/Xmp/XmpProfile.cs b/src/Magick.NET.Core/Profiles/Xmp/XmpProfile.cs
@@ -33,7 +33,7 @@ public XmpProfile(IXPathNavigable document)
         Throw.IfNull(nameof(document), document);
 
         using var memStream = new MemoryStream();
-        using var writer = XmlWriter.Create(memStream);
+        using var writer = CreateXmlWriter(memStream);
         document.CreateNavigator().WriteSubtree(writer);
         writer.Flush();
         SetData(memStream.ToArray());
@@ -49,7 +49,7 @@ public XmpProfile(XDocument document)
         Throw.IfNull(nameof(document), document);
 
         using var memStream = new MemoryStream();
-        using var writer = XmlWriter.Create(memStream);
+        using var writer = CreateXmlWriter(memStream);
         document.WriteTo(writer);
         writer.Flush();
         SetData(memStream.ToArray());
@@ -128,6 +128,15 @@ public XDocument ToXDocument()
         return XDocument.Load(reader);
     }
 
+    private static XmlWriter CreateXmlWriter(MemoryStream memStream)
+    {
+        var settings = new XmlWriterSettings
+        {
+            OmitXmlDeclaration = true,
+        };
+        return XmlWriter.Create(memStream, settings);
+    }
+
     private static byte[] CheckTrailingNULL(byte[] data)
     {
         Throw.IfNull(nameof(data), data);

diff --git a/tests/Magick.NET.Tests/Profiles/Xmp/XmpProfileTests/TheFromIXPathNavigableMethod.cs b/tests/Magick.NET.Tests/Profiles/Xmp/XmpProfileTests/TheFromIXPathNavigableMethod.cs
@@ -31,7 +31,7 @@ public void ShouldCreateProfileFromIXPathNavigable()
 
             var xml = Encoding.UTF8.GetString(profile.ToByteArray());
 
-            Assert.Equal(@"<?xml version=""1.0"" encoding=""utf-8""?><test />", xml);
+            Assert.Equal(@"<test />", xml);
         }
     }
 }
diff --git a/tests/Magick.NET.Tests/Profiles/Xmp/XmpProfileTests/TheFromXDocumentMethod.cs b/tests/Magick.NET.Tests/Profiles/Xmp/XmpProfileTests/TheFromXDocumentMethod.cs
@@ -30,7 +30,7 @@ public void ShouldCreateProfileFromIXDocument()
 
             var xml = Encoding.UTF8.GetString(profile.ToByteArray());
 
-            Assert.Equal(@"<?xml version=""1.0"" encoding=""utf-8""?><test />", xml);
+            Assert.Equal("<test />", xml);
         }
     }
 }