Skip to content

Commit 4e7a011

Browse files
committed
Fixed bug where XmpProfile.FromIXPathNavigable and XmpProfile.FromXDocument would add a xml declaration (#1652).
1 parent b38478d commit 4e7a011

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/Magick.NET.Core/Profiles/Xmp/XmpProfile.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public XmpProfile(IXPathNavigable document)
3333
Throw.IfNull(nameof(document), document);
3434

3535
using var memStream = new MemoryStream();
36-
using var writer = XmlWriter.Create(memStream);
36+
using var writer = CreateXmlWriter(memStream);
3737
document.CreateNavigator().WriteSubtree(writer);
3838
writer.Flush();
3939
SetData(memStream.ToArray());
@@ -49,7 +49,7 @@ public XmpProfile(XDocument document)
4949
Throw.IfNull(nameof(document), document);
5050

5151
using var memStream = new MemoryStream();
52-
using var writer = XmlWriter.Create(memStream);
52+
using var writer = CreateXmlWriter(memStream);
5353
document.WriteTo(writer);
5454
writer.Flush();
5555
SetData(memStream.ToArray());
@@ -128,6 +128,15 @@ public XDocument ToXDocument()
128128
return XDocument.Load(reader);
129129
}
130130

131+
private static XmlWriter CreateXmlWriter(MemoryStream memStream)
132+
{
133+
var settings = new XmlWriterSettings
134+
{
135+
OmitXmlDeclaration = true,
136+
};
137+
return XmlWriter.Create(memStream, settings);
138+
}
139+
131140
private static byte[] CheckTrailingNULL(byte[] data)
132141
{
133142
Throw.IfNull(nameof(data), data);

tests/Magick.NET.Tests/Profiles/Xmp/XmpProfileTests/TheFromIXPathNavigableMethod.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void ShouldCreateProfileFromIXPathNavigable()
3131

3232
var xml = Encoding.UTF8.GetString(profile.ToByteArray());
3333

34-
Assert.Equal(@"<?xml version=""1.0"" encoding=""utf-8""?><test />", xml);
34+
Assert.Equal(@"<test />", xml);
3535
}
3636
}
3737
}

tests/Magick.NET.Tests/Profiles/Xmp/XmpProfileTests/TheFromXDocumentMethod.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void ShouldCreateProfileFromIXDocument()
3030

3131
var xml = Encoding.UTF8.GetString(profile.ToByteArray());
3232

33-
Assert.Equal(@"<?xml version=""1.0"" encoding=""utf-8""?><test />", xml);
33+
Assert.Equal("<test />", xml);
3434
}
3535
}
3636
}

0 commit comments

Comments
 (0)