fix tlg data GC causing AccessViolation issue #109

UlyssesWu · May 31, 2023 · af91cd1 · af91cd1
1 parent f9e8f04
commit af91cd1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/FreeMote.Plugins/FreeMote.Plugins.csproj b/FreeMote.Plugins/FreeMote.Plugins.csproj
@@ -23,7 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <LangVersion>default</LangVersion>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,6 +34,7 @@
     <WarningLevel>4</WarningLevel>
     <LangVersion>default</LangVersion>
     <PlatformTarget>AnyCPU</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +45,7 @@
     <LangVersion>default</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -54,6 +56,7 @@
     <LangVersion>default</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/FreeMote.Plugins/Shells/PsdShell.cs b/FreeMote.Plugins/Shells/PsdShell.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using FastBitmapLib;
 using FreeMote.Plugins.Properties;
 using FreeMote.Psb;
 using PhotoshopFile;
@@ -610,6 +611,8 @@ class GroupLayer : ILayer
         public void CreateLayers(PsdFile psd)
         {
             var beginLayer = psd.MakeSectionLayers(Name, out var endLayer, Open);
+            beginLayer.Visible = Object.TryGetValue("visible", out var visible) && visible.GetInt() != 0;
+            beginLayer.Opacity = (byte) (Object.TryGetValue("opacity", out var opacity) ? opacity.GetInt() : 255);
             if (LayerId is >= 0 and <= PsdShell.MaxLayerId)
             {
                 var idLayer = new LayerId((uint) LayerId);

diff --git a/FreeMote/TlgImageConverter.cs b/FreeMote/TlgImageConverter.cs
@@ -132,7 +132,7 @@ internal TlgMetaData ReadMetaData (BinaryReader br)
             };
         }
 
-        public Bitmap ReadAndGetMetaData(BinaryReader file, out TlgMetaData md)
+        public Bitmap ReadAndGetMetaData(BinaryReader file, out TlgMetaData md, bool copy = true)
         {
             TlgMetaData meta = ReadMetaData(file);
             md = meta;
@@ -157,8 +157,13 @@ public Bitmap ReadAndGetMetaData(BinaryReader file, out TlgMetaData md)
                     Trace.WriteLine(x.Message, "[TlgFormat.Read]");
                 }
             }
+
             //PixelFormat format = 32 == meta.BPP ? PixelFormats.Bgra32 : PixelFormats.Bgr32;
             PixelFormat format = 32 == meta.Bpp ? PixelFormat.Format32bppArgb : PixelFormat.Format32bppRgb;
+            if (copy)
+            {
+                return RL.ConvertToImage(image, (int) meta.Width, (int) meta.Height, PsbPixelFormat.LeRGBA8);
+            }
             return CreateImage(meta, format, image, (int)meta.Width * 4);
         }