Workaround for quoted FuncIRIs.

Improve performance when accessing internal properties of SvgElement.

Author: otuncelli

SvgFileType/Extensions/SvgDocumentExtensions.cs

@@ -3,8 +3,6 @@
 
 using System;
 using System.Drawing;
-using System.IO;
-using System.Text;
 using Svg;
 using SvgFileTypePlugin.Import;
 
@@ -38,7 +36,7 @@ public static IDisposable UseSetRasterDimensions(this SvgDocument svg, SvgImport
         svg.Width = rasterSize.Width;
         svg.Height = rasterSize.Height;
         svg.ViewBox = new SvgViewBox(0, 0, originalSize.Width, originalSize.Height);
-        SvgPreserveAspectRatio aspectRatio = config.PreserveAspectRatio 
+        SvgPreserveAspectRatio aspectRatio = config.PreserveAspectRatio
             ? SvgPreserveAspectRatio.xMinYMin
             : SvgPreserveAspectRatio.none;
         svg.AspectRatio = new SvgAspectRatio(aspectRatio);
@@ -51,23 +49,4 @@ public static IDisposable UseSetRasterDimensions(this SvgDocument svg, SvgImport
             svg.ViewBox = originalViewbox;
         });
     }
-
-    public static string GetXML2(this SvgDocument svg)
-    {
-        ArgumentNullException.ThrowIfNull(svg);
-
-        // This issue has been resolved for resvg but,
-        // apparently, Direct2D renderer is also affected.
-        // https://github.com/RazrFalcon/resvg/issues/235
-        return svg.GetXML().Replace(""", string.Empty);
-    }
-
-    public static Stream AsStream(this SvgDocument svg, bool removeQuotes = false)
-    {
-        ArgumentNullException.ThrowIfNull(svg);
-
-        string xml = removeQuotes ? svg.GetXML2() : svg.GetXML();
-        byte[] bytes = Encoding.UTF8.GetBytes(xml);
-        return new MemoryStream(bytes);
-    }
 }

SvgFileType/Extensions/SvgElementExtensions.cs

@@ -2,30 +2,35 @@
 // Use of this source code is governed by GNU General Public License (GPL-2.0) that can be found in the COPYING file.
 
 using System;
+using System.IO;
 using System.Reflection;
+using System.Text;
 using Svg;
 
 namespace SvgFileTypePlugin.Extensions;
 
 internal static class SvgElementExtensions
 {
-    private static readonly MethodInfo? ElementNameGetter = GetGetMethod("ElementName");
-    private static readonly MethodInfo? AttributesGetter = GetGetMethod("Attributes");
+    private delegate SvgAttributeCollection AttributesGetterDelegate(SvgElement element);
+    private delegate string? ElementNameGetterDelegate(SvgElement element);
+
+    private static readonly AttributesGetterDelegate GetElementAttributes = CreateGetterDelegate<AttributesGetterDelegate>("Attributes");
+    private static readonly ElementNameGetterDelegate GetElementName = CreateGetterDelegate<ElementNameGetterDelegate>("ElementName");
 
     public static string GetName(this SvgElement element)
     {
         ArgumentNullException.ThrowIfNull(element);
 
-        return element.GetType().GetCustomAttribute<SvgElementAttribute>()?.ElementName 
-            ?? ElementNameGetter?.Invoke(element, null) as string 
+        return element.GetType().GetCustomAttribute<SvgElementAttribute>()?.ElementName
+            ?? GetElementName(element)
             ?? element.GetType().Name;
     }
 
-    public static SvgAttributeCollection? GetAttributes(this SvgElement element)
+    public static SvgAttributeCollection GetAttributes(this SvgElement element)
     {
         ArgumentNullException.ThrowIfNull(element);
 
-        return (SvgAttributeCollection?)AttributesGetter?.Invoke(element, null);
+        return GetElementAttributes(element);
     }
 
     public static void RemoveInvisibleAndNonTextElements(this SvgElement element)
@@ -42,8 +47,28 @@ public static void RemoveInvisibleAndNonTextElements(this SvgElement element)
         }
     }
 
-    private static MethodInfo? GetGetMethod(string propertyName)
+    public static string GetXML_QuotedFuncIRIHack(this SvgElement svg)
+    {
+        ArgumentNullException.ThrowIfNull(svg);
+
+        return svg.GetXML().Replace("&quot;", string.Empty);
+    }
+
+    public static Stream GetXMLAsStream(this SvgElement svg)
+    {
+        ArgumentNullException.ThrowIfNull(svg);
+
+        string xml = svg.GetXML_QuotedFuncIRIHack();
+        byte[] bytes = Encoding.UTF8.GetBytes(xml);
+        return new MemoryStream(bytes);
+    }
+
+    private static T CreateGetterDelegate<T>(string propertyName) where T : Delegate
     {
-        return typeof(SvgElement).GetProperty(propertyName, BindingFlags.NonPublic | BindingFlags.Instance)?.GetGetMethod(true);
+        MethodInfo getter = typeof(SvgElement)
+            ?.GetProperty(propertyName, BindingFlags.NonPublic | BindingFlags.Instance)
+            ?.GetGetMethod(true)
+            ?? throw new MissingMemberException(nameof(SvgElement), propertyName);
+        return getter.CreateDelegate<T>();
     }
 }

SvgFileType/Import/Direct2DSvgRenderer.cs

@@ -42,7 +42,7 @@ protected override Document GetFlatDocument(string svgdata, SvgImportConfig conf
             using IBitmap<ColorBgra32> sbitmap = surface.CreateSharedBitmap();
             using IBitmap<ColorPbgra32> pbitmap = sbitmap.CreatePremultipliedAdapter(PremultipliedAdapterOptions.UnPremultiplyOnDispose);
             using IDeviceContext dc = d2d.CreateBitmapDeviceContext(pbitmap);
-            using Stream stream = svgdoc.AsStream(removeQuotes: true);
+            using Stream stream = svgdoc.GetXMLAsStream();
             using ISvgDocument svg = dc.CreateSvgDocument(stream, viewport);
             using DrawingScope _1 = dc.UseBeginDraw();
             dc.Clear();
@@ -190,7 +190,7 @@ private void RenderSvgDocument(SvgElement element, IDeviceContext dc)
         else
         {
             SvgDocument clone = element.OwnerDocument.RemoveInvisibleAndNonTextElements();
-            using Stream stream = clone.AsStream(removeQuotes: true);
+            using Stream stream = clone.GetXMLAsStream();
             using ISvgDocument partial = dc.CreateSvgDocument(stream, dc.Size);
             using DrawingScope _ = dc.UseBeginDraw();
             dc.Clear();

SvgFileType/Import/ResvgSvgRenderer.cs

@@ -139,7 +139,7 @@ private void RenderSvgDocument(SvgElement element, Surface surface, ResvgOptions
         else
         {
             SvgDocument clone = element.OwnerDocument.RemoveInvisibleAndNonTextElements();
-            using (Resvg resvg = Resvg.FromData(clone.GetXML(), options))
+            using (Resvg resvg = Resvg.FromData(clone.GetXML_QuotedFuncIRIHack(), options))
                 resvg.Render(surface.Scan0.Pointer, surface.Width, surface.Height);
             surface.ConvertFromPrgba();
         }