Optimized Symbol Load by direcly cloning byte[]

DMXControl · Sep 14, 2020 · 2581c88 · 2581c88
1 parent c0fc328
commit 2581c88
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 27 deletions.
diff --git a/3DxIcon_16.png → 3DxIcon_16.png.bin b/3DxIcon_16.png → 3DxIcon_16.png.bin
diff --git a/3DxIcon_32.png → 3DxIcon_32.png.bin b/3DxIcon_32.png → 3DxIcon_32.png.bin
diff --git a/Lumos3DconnexionPlugin.csproj b/Lumos3DconnexionPlugin.csproj
@@ -113,10 +113,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="3DxIcon_32.png" />
+    <None Include="3DxIcon_32.png.bin" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="3DxIcon_16.png" />
+    <None Include="3DxIcon_16.png.bin" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -118,10 +118,10 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="_3DxIcon_16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\3DxIcon_16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="_3DxIcon_16_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\3dxicon_16.png.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="_3DxIcon_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\3DxIcon_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="_3DxIcon_32_png" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\3dxicon_32.png.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
 </root>
diff --git a/_3DxPlugin.cs b/_3DxPlugin.cs
@@ -202,19 +202,14 @@ public byte[] loadResource(EResourceDataType type, string name)
         {
             if (type == EResourceDataType.SYMBOL)
             {
-                using (var ms = new MemoryStream())
+                switch (name)
                 {
-                    switch (name)
-                    {
-                        case "3DxIcon":
-                        case "3DxIcon_32":
-                            Properties.Resources._3DxIcon_32.Save(ms, ImageFormat.Png);
-                            return ms.ToArray();
-
-                        case "3DxIcon_16":
-                            Properties.Resources._3DxIcon_16.Save(ms, ImageFormat.Png);
-                            return ms.ToArray();
-                    }
+                    case "3DxIcon":
+                    case "3DxIcon_32":
+                        return (byte[]) Properties.Resources._3DxIcon_32_png.Clone();
+
+                    case "3DxIcon_16":
+                        return (byte[]) Properties.Resources._3DxIcon_16_png.Clone();
                 }
             }