diff --git a/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs b/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs index 09d27721..019f7b36 100644 --- a/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs +++ b/PCK-Studio/Internal/Deserializer/ImageDeserializer.cs @@ -26,19 +26,11 @@ namespace PckStudio.Internal.Deserializer return EmptyImage; using var stream = new MemoryStream(asset.Data); - try - { - if (Path.GetExtension(asset.Filename) == ".tga") - return TGADeserializer.DeserializeFromStream(stream); - else - return Image.FromStream(stream); - } - catch (Exception ex) - { - Trace.TraceError($"Failed to read image from pck file data({asset.Filename})."); - Debug.WriteLine(ex.Message); - return EmptyImage; - } + + Image img = Path.GetExtension(asset.Filename) == ".tga" + ? TGADeserializer.DeserializeFromStream(stream) + : Image.FromStream(stream); + return img.RawFormat != ImageFormat.Jpeg || img.RawFormat != ImageFormat.Png ? new Bitmap(img) : img; } } } diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 480602f9..5c73f08c 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -847,11 +847,6 @@ namespace PckStudio { Image img = asset.GetTexture(); - if (img.RawFormat != ImageFormat.Jpeg || img.RawFormat != ImageFormat.Png) - { - img = new Bitmap(img); - } - try { previewPictureBox.Image = img;