updated for paint.net v4.0.21

otuncelli · otuncelli · commit 96ec17b2b003 · 2018-02-03T18:40:25.000+03:00
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ This is a Paint.NET filetype plugin for loading SVG (Scalable Vector Graphics) a
 
 The plugin is a tiny wrapper around the [SVG.NET Library](https://github.com/vvvv/SVG) which does the actual SVG reading.
 
-Tested on Paint.NET 4.0.13.
+Tested on Paint.NET 4.0.21.
 
 Please check the [Releases](https://github.com/otuncelli/Scalable-Vector-Graphics-Plugin-for-Paint.NET/releases) section for binary download.
 
diff --git a/SVGType/packages.config b/SVGType/packages.config
diff --git a/SvgFileType.sln b/SvgFileType.sln
@@ -1,9 +1,9 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2027
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SVGType", "SVGType\SVGType.csproj", "{C32235C8-90B3-4C43-B589-B821C84839E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SvgFileTypePlugin", "SvgFileType\SvgFileTypePlugin.csproj", "{C32235C8-90B3-4C43-B589-B821C84839E9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1ACF9C3B-BF8E-4939-88D4-BA7E2CE114E5}
+	EndGlobalSection
 EndGlobal
diff --git a/SvgFileType/Properties/AssemblyInfo.cs b/SvgFileType/Properties/AssemblyInfo.cs
@@ -5,12 +5,12 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SVGType")]
+[assembly: AssemblyTitle("SvgFileType")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SVGType")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
+[assembly: AssemblyProduct("SvgFileType")]
+[assembly: AssemblyCopyright("Copyright ©  2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/SvgFileType/SvgFileType.cs b/SvgFileType/SvgFileType.cs
@@ -5,14 +5,13 @@
 using System.Drawing;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using System.Windows.Forms;
 
-namespace SVGType
+namespace SvgFileTypePlugin
 {
-    public class SvgType : FileType
+    public class SvgFileType : FileType
     {
-        public SvgType()
+        public SvgFileType()
             : base(
                 "Scalable Vector Graphics",
                 FileTypeFlags.SupportsLoading,
@@ -33,26 +32,11 @@ private static Form GetMainForm()
             }
         }
 
-        private static bool IsCompressed(Stream input)
-        {
-            if (input.Length < 3)
-                return false;
-            var headerBytes = new byte[3];
-            input.Read(headerBytes, 0, 3);
-            input.Position = 0;
-            return headerBytes.SequenceEqual(new byte[] {0x1f, 0x8b, 0x8});
-        }
-
         protected override Document OnLoad(Stream input)
         {
-            if (IsCompressed(input))
-                input = new GZipStream(input, CompressionMode.Decompress);
-
             SvgDocument doc;
-            using (input)
-            {
-                doc = SvgDocument.Open<SvgDocument>(input);
-            }
+            using (var wrapper = new SvgStreamWrapper(input))
+                doc = SvgDocument.Open<SvgDocument>(wrapper.SvgStream);
 
             bool keepAspectRatio;
             int resolution;
@@ -62,21 +46,21 @@ protected override Document OnLoad(Stream input)
             var vph = 0;
             if (!doc.Width.IsNone && !doc.Width.IsEmpty &&
                 doc.Width.Type != SvgUnitType.Percentage)
-                vpw = (int) doc.Width.Value;
+                vpw = (int)doc.Width.Value;
             if (!doc.Height.IsNone && !doc.Height.IsEmpty &&
                 doc.Height.Type != SvgUnitType.Percentage)
-                vph = (int) doc.Height.Value;
-            var vbx = (int) doc.ViewBox.MinX;
-            var vby = (int) doc.ViewBox.MinY;
-            var vbw = (int) doc.ViewBox.Width;
-            var vbh = (int) doc.ViewBox.Height;
+                vph = (int)doc.Height.Value;
+            var vbx = (int)doc.ViewBox.MinX;
+            var vby = (int)doc.ViewBox.MinY;
+            var vbw = (int)doc.ViewBox.Width;
+            var vbh = (int)doc.ViewBox.Height;
             DialogResult dr = DialogResult.Cancel;
-            using (var dialog = new UIDialog())
+            using (var dialog = new UiDialog())
             {
                 Form mainForm = GetMainForm();
                 if (mainForm != null)
                 {
-                    mainForm.Invoke((MethodInvoker) (() =>
+                    mainForm.Invoke((MethodInvoker)(() =>
                     {
                         dialog.SetSvgInfo(vpw, vph, vbx, vby, vbw, vbh);
                         dr = dialog.ShowDialog(mainForm);
@@ -107,5 +91,38 @@ protected override Document OnLoad(Stream input)
             }
             return Document.FromImage(bmp);
         }
+
+        private sealed class SvgStreamWrapper : IDisposable
+        {
+            public Stream SvgStream { get; }
+
+            public SvgStreamWrapper(Stream input)
+            {
+                if (input.Length < 3)
+                    throw new InvalidDataException();
+                var headerBytes = new byte[3];
+                input.Read(headerBytes, 0, 3);
+                input.Position = 0;
+                if (headerBytes[0] == 0x1f && headerBytes[1] == 0x8b && headerBytes[2] == 0x8)
+                    SvgStream = new GZipStream(input, CompressionMode.Decompress, true);
+                else
+                    SvgStream = input;
+            }
+
+            #region IDisposable
+
+            private bool _disposed;
+
+            public void Dispose()
+            {
+                if (_disposed)
+                    return;
+                if (SvgStream is GZipStream)
+                    SvgStream.Dispose();
+                _disposed = true;
+            }
+
+            #endregion
+        }
     }
 }
diff --git a/SvgFileType/SvgFileTypeFactory.cs b/SvgFileType/SvgFileTypeFactory.cs
@@ -1,14 +1,14 @@
 ﻿using PaintDotNet;
 
-namespace SVGType
+namespace SvgFileTypePlugin
 {
-    public class SvgTypeFactory : IFileTypeFactory
+    public class SvgFileTypeFactory : IFileTypeFactory
     {
         public FileType[] GetFileTypeInstances()
         {
             return new FileType[]
             {
-                new SvgType()
+                new SvgFileType()
             };
         }
     }
diff --git a/SvgFileType/SvgFileTypePlugin.csproj b/SvgFileType/SvgFileTypePlugin.csproj
@@ -7,9 +7,9 @@
     <ProjectGuid>{C32235C8-90B3-4C43-B589-B821C84839E9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SVGType</RootNamespace>
-    <AssemblyName>SVGType</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <RootNamespace>SvgFileTypePlugin</RootNamespace>
+    <AssemblyName>SvgFileType</AssemblyName>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -40,9 +40,9 @@
     <Reference Include="PaintDotNet.Data">
       <HintPath>C:\Program Files\paint.net\PaintDotNet.Data.dll</HintPath>
     </Reference>
-    <Reference Include="Svg, Version=2.2.1.39233, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
-      <HintPath>..\packages\Svg.2.3.0\lib\net35\Svg.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Svg, Version=2.2.1.10396, Culture=neutral, PublicKeyToken=12a0bac221edeae2, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Downloads\SVG-master\Source\bin\Release\Svg.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -51,22 +51,19 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SvgType.cs" />
+    <Compile Include="SvgFileType.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SvgTypeFactory.cs" />
-    <Compile Include="UIDialog.cs">
+    <Compile Include="SvgFileTypeFactory.cs" />
+    <Compile Include="UiDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UIDialog.Designer.cs">
-      <DependentUpon>UIDialog.cs</DependentUpon>
+    <Compile Include="UiDialog.Designer.cs">
+      <DependentUpon>UiDialog.cs</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="UIDialog.resx">
-      <DependentUpon>UIDialog.cs</DependentUpon>
+    <EmbeddedResource Include="UiDialog.resx">
+      <DependentUpon>UiDialog.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/SvgFileType/UIDialog.Designer.cs b/SvgFileType/UIDialog.Designer.cs
diff --git a/SvgFileType/UIDialog.cs b/SvgFileType/UIDialog.cs
@@ -2,11 +2,11 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace SVGType
+namespace SvgFileTypePlugin
 {
-    public partial class UIDialog : Form
+    public partial class UiDialog : Form
     {
-        public UIDialog()
+        public UiDialog()
         {
             InitializeComponent();
         }
diff --git a/SvgFileType/UiDialog.resx b/SvgFileType/UiDialog.resx

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`using PaintDotNet;`
`2`	`2`
`3`		`-namespace SVGType`
	`3`	`+namespace SvgFileTypePlugin`
`4`	`4`	`{`
`5`		`- public class SvgTypeFactory : IFileTypeFactory`
	`5`	`+ public class SvgFileTypeFactory : IFileTypeFactory`
`6`	`6`	`{`
`7`	`7`	`public FileType[] GetFileTypeInstances()`
`8`	`8`	`{`
`9`	`9`	`return new FileType[]`
`10`	`10`	`{`
`11`		`- new SvgType()`
	`11`	`+ new SvgFileType()`
`12`	`12`	`};`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`	`using System.Drawing;`
`3`	`3`	`using System.Windows.Forms;`
`4`	`4`
`5`		`-namespace SVGType`
	`5`	`+namespace SvgFileTypePlugin`
`6`	`6`	`{`
`7`		`- public partial class UIDialog : Form`
	`7`	`+ public partial class UiDialog : Form`
`8`	`8`	`{`
`9`		`- public UIDialog()`
	`9`	`+ public UiDialog()`
`10`	`10`	`{`
`11`	`11`	`InitializeComponent();`
`12`	`12`	`}`