LegacyConsole/PCK-Studio
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-05-23 00:34:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ImageDeserializer - Add format check when deserializing

Browse Source
This commit is contained in:
miku-666
2025-02-05 19:13:41 +01:00
parent 2753a84da4
commit bf48d879d5
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PCK-Studio/Internal/Deserializer/ImageDeserializer.cs
View File

@@ -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;
}
}
}

5
PCK-Studio/MainForm.cs
View File

@@ -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;