Fixes the pixel artifacts occurring on small size outputs (#16)

Author: otuncelli

SvgFileType/Extensions/SurfaceExtensions.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Runtime.CompilerServices;
 using PaintDotNet;
-using PaintDotNet.Rendering;
 
 namespace SvgFileTypePlugin.Extensions;
 
@@ -29,22 +28,6 @@ public static Document CreateSingleLayerDocument(this Surface surface, bool take
         return document;
     }
 
-    public static void ConvertFromPrgba(this Surface surface)
-    {
-        ArgumentNullException.ThrowIfNull(surface);
-
-        for (int y = 0; y < surface.Height; y++)
-        {
-            ref ColorBgra pix = ref surface.GetRowReferenceUnchecked(y);
-            for (int x = surface.Width; x > 0; x--)
-            {
-                (pix.R, pix.B) = (pix.B, pix.R);
-                pix = ref Unsafe.Add(ref pix, 1);
-            }
-        }
-        surface.ConvertFromPremultipliedAlpha();
-    }
-
     public static bool IsEmpty(this Surface surface)
     {
         ArgumentNullException.ThrowIfNull(surface);
@@ -71,9 +54,6 @@ public static bool IsEmpty(this Surface surface)
         int h = tmp.Height;
         int stride = tmp.Stride;
         surface.Fill(backgroundColor);
-        unsafe
-        {
-            new T().UnsafeApply(w, h, (ColorBgra*)surface.Scan0.Pointer, stride, (ColorBgra*)tmp.Scan0.Pointer, stride);
-        }
+        new T().Apply(surface, tmp);
     }
 }

SvgFileType/FodyWeavers.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-    <ILMerge IncludeAssemblies="Svg|ExCss|resvg.net|BitmapVectorizer|SimplePaletteQuantizer|PaintDotNet.IndirectUI.Fluent" NamespacePrefix="" IncludeResources="\.(resources|dtd|zip)$" CompactMode="0" FullImport="0" />
+    <ILMerge IncludeAssemblies="Svg|ExCss|resvg.net|BitmapVectorizer|SimplePaletteQuantizer|PaintDotNet.IndirectUI.Fluent" NamespacePrefix="" IncludeResources="\.(resources|dtd|zip)$" CompactMode="0" FullImport="1" />
 </Weavers>

SvgFileType/Import/MyBaseForm.cs

@@ -302,7 +302,7 @@ public static bool UseImmersiveDarkModeColors(IWin32Window window, bool enable)
             {
                 Attribute = WindowCompositionAttribute.WCA_USEDARKMODECOLORS,
                 Data = enable ? 1 : 0,
-                SizeOfData = Marshal.SizeOf(typeof(int))
+                SizeOfData = Marshal.SizeOf<int>()
             };
             bool success = SetWindowCompositionAttribute(window.Handle, data);
             return success;
@@ -341,7 +341,7 @@ private static bool IsWindows10OrGreater(int build = -1)
         }
 
         [DllImport("uxtheme", SetLastError = true, ExactSpelling = true, CharSet = CharSet.Unicode)]
-        private static extern int SetWindowTheme(IntPtr hWnd, string pszSubAppName, string pszSubIdList);
+        private static extern int SetWindowTheme(IntPtr hWnd, string? pszSubAppName, string? pszSubIdList);
 
         [DllImport("uxtheme", SetLastError = true, EntryPoint = "#133")]
         [return: MarshalAs(UnmanagedType.Bool)]

SvgFileType/Import/ResvgSvgRenderer.cs

@@ -25,15 +25,12 @@ protected override Document GetFlatDocument(string svgdata, SvgImportConfig conf
         using BenchmarkScope _ = new BenchmarkScope();
         using MemoryFailPoint mfp = GetMemoryFailPoint(width, height, 1);
         ResetProgress(1);
-        Surface surface = new Surface(width, height, SurfaceCreationFlags.DoNotZeroFillHint);
+        Surface surface = new Surface(width, height);
         try
         {
-            using (Resvg resvg = Resvg.FromData(svgdata, loadSystemFonts: true))
-            {
-                ResvgTransform transform = CalculateTransform(resvg.Size, config);
-                resvg.Render(surface.Scan0.Pointer, transform, width, height);
-            }
-            surface.ConvertFromPrgba();
+            using Resvg resvg = Resvg.FromData(svgdata, loadSystemFonts: true);
+            ResvgTransform transform = CalculateTransform(resvg.Size, config);
+            resvg.Render(surface.Scan0.Pointer, transform, width, height, PixelOpFlags.RgbaToBgra | PixelOpFlags.UnPremultiplyAlpha);
         }
         catch (Exception)
         {
@@ -66,7 +63,7 @@ protected override Document GetLayeredDocument(string svgdata, SvgImportConfig c
         using ResvgOptions options = new ResvgOptions();
         options.LoadSystemFonts();
 
-        using Surface surface = new Surface(config.RasterWidth, config.RasterHeight);
+        using Surface surface = new Surface(config.RasterWidth, config.RasterHeight, SurfaceCreationFlags.DoNotZeroFillHint);
         // Render all visual elements that are passed here.
         foreach (SvgVisualElement element in elements)
         {
@@ -141,9 +138,9 @@ private void RenderSvgDocument(SvgElement element, Surface surface, ResvgOptions
         else
         {
             SvgDocument clone = element.OwnerDocument.RemoveInvisibleAndNonTextElements();
-            using (Resvg resvg = Resvg.FromData(clone.GetXML_QuotedFuncIRIHack(), options))
-                resvg.Render(surface.Scan0.Pointer, surface.Width, surface.Height);
-            surface.ConvertFromPrgba();
+            (int width, int height) = (surface.Width, surface.Height);
+            using Resvg resvg = Resvg.FromData(clone.GetXML_QuotedFuncIRIHack(), options);
+            resvg.Render(surface.Scan0.Pointer, width, height, PixelOpFlags.RgbaToBgra | PixelOpFlags.UnPremultiplyAlpha);
         }
     }
 
@@ -156,8 +153,8 @@ private static ResvgTransform CalculateTransform(SizeF svgsize, SvgImportConfig
             : config.RasterHeight / svgsize.Height * tolerance;
         return new ResvgTransform()
         {
-            a = ratioX,
-            d = ratioY
+            M11 = ratioX,
+            M22 = ratioY
         };
     }
 }

SvgFileType/SvgFileType.cs

@@ -155,17 +155,12 @@ protected override bool ShouldSerializeTokenProperty(Property property)
 
     private static bool IsSerializable(Property property)
     {
-        switch (property.Name)
-        {
-            case nameof(PropertyNames.GitHubLink):
-            case nameof(PropertyNames.DiscussionLink):
-            case nameof(PropertyNames.PdnShape):
-            case nameof(PropertyNames.PdnShapeName):
-            case nameof(PropertyNames.PreviewMode):
-                return false;
-            default:
-                return Enum.IsDefined(typeof(PropertyNames), property.Name);
-        }
+        return Enum.TryParse(property.Name, out PropertyNames prop)
+            && prop is not PropertyNames.GitHubLink
+            and not PropertyNames.DiscussionLink
+            and not PropertyNames.PdnShape
+            and not PropertyNames.PdnShapeName
+            and not PropertyNames.PreviewMode;
     }
 
     #endregion

SvgFileType/SvgFileTypePlugin.csproj

@@ -10,7 +10,6 @@
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <RootNamespace>SvgFileTypePlugin</RootNamespace>
     <UseWindowsForms>true</UseWindowsForms>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Label="AssemblyInfo" Condition="'$(GenerateAssemblyInfo)'=='true' Or '$(GenerateAssemblyInfo)'==''">
@@ -19,7 +18,7 @@
     <Copyright>Copyright © 2025 Osman Tunçelli</Copyright>
     <Company>$(Copyright)</Company>
     <Product>$(AssemblyTitle)</Product>
-    <Version>1.0.7.0</Version>
+    <Version>1.0.7.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Label="Base Variables">