Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-23 19:34:15 +08:00
Code Issues Projects Releases Wiki Activity

(gpd, msk): recognize earlier format versions.

Browse Source
This commit is contained in:
morkt 2018-11-10 22:11:18 +04:00
parent da057b4326
commit cc89377dc7
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArcFormats/Ankh/ImageGPD.cs
View File

@ -30,6 +30,11 @@ using GameRes.Compression;
namespace GameRes.Formats.Ankh
{
internal class GpdMetaData : ImageMetaData
{
public int HeaderSize;
}
[Export(typeof(ImageFormat))]
public class GpdFormat : ImageFormat
{
@ -40,19 +45,19 @@ namespace GameRes.Formats.Ankh
public override ImageMetaData ReadMetaData (IBinaryStream file)
{
var header = file.ReadHeader (0x10);
if (header.ToInt32 (12) != 0)
return null;
return new ImageMetaData {
return new GpdMetaData {
Width = header.ToUInt32 (4),
Height = header.ToUInt32 (8),
BPP = 24,
HeaderSize = header.ToInt32 (12) != 0 ? 12 : 16,
};
}
public override ImageData Read (IBinaryStream file, ImageMetaData info)
{
var meta = (GpdMetaData)info;
int stride = (int)info.Width * 3;
file.Position = 0x10;
file.Position = meta.HeaderSize;
using (var lzss = new LzssStream (file.AsStream, LzssMode.Decompress, true))
{
var pixels = new byte[stride * (int)info.Height];

8
ArcFormats/Ankh/ImageMSK.cs
View File

@ -40,18 +40,18 @@ namespace GameRes.Formats.Ankh
public override ImageMetaData ReadMetaData (IBinaryStream file)
{
var header = file.ReadHeader (0x10);
if (header.ToInt32 (12) != 0)
return null;
return new ImageMetaData {
return new GpdMetaData {
Width = header.ToUInt32 (4),
Height = header.ToUInt32 (8),
BPP = 8,
HeaderSize = header.ToInt32 (12) != 0 ? 12 : 16,
};
}
public override ImageData Read (IBinaryStream file, ImageMetaData info)
{
file.Position = 0x10;
var meta = (GpdMetaData)info;
file.Position = meta.HeaderSize;
using (var lzss = new LzssStream (file.AsStream, LzssMode.Decompress, true))
{
var pixels = new byte[info.Width * info.Height];