Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-24 03:44:13 +08:00
Code Issues Projects Releases Wiki Activity

(BMP): use image offset stored in header.

Browse Source
This commit is contained in:
morkt 2017-11-12 10:02:21 +04:00
parent dd26dd9ae3
commit 800e69dfcb
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArcFormats/NekoSDK/ImageALP.cs
View File

@ -48,7 +48,7 @@ namespace GameRes.Formats.NekoSDK
if (alpha.Length != alp.Read (alpha, 0, alpha.Length) || alp.ReadByte() != -1) if (alpha.Length != alp.Read (alpha, 0, alpha.Length) || alp.ReadByte() != -1)
return null; return null;
} }
file.Position = info.HeaderLength; file.Position = info.ImageOffset;
int dst_stride = (int)info.Width * 4; int dst_stride = (int)info.Width * 4;
int gap = -((int)info.Width * info.BPP / 8) & 3; int gap = -((int)info.Width * info.BPP / 8) & 3;
var pixels = new byte[(int)info.Height * dst_stride]; var pixels = new byte[(int)info.Height * dst_stride];

13
GameRes/ImageBMP.cs
View File

@ -37,7 +37,7 @@ namespace GameRes
public class BmpMetaData : ImageMetaData public class BmpMetaData : ImageMetaData
{ {
public uint ImageLength; public uint ImageLength;
public uint HeaderLength; public uint ImageOffset;
} }
public interface IBmpExtension public interface IBmpExtension
@ -114,7 +114,8 @@ namespace GameRes
if ('B' != c1 || 'M' != c2) if ('B' != c1 || 'M' != c2)
return null; return null;
uint size = file.ReadUInt32(); uint size = file.ReadUInt32();
SkipBytes (file, 8); file.ReadUInt32();
uint image_offset = file.ReadUInt32();
uint header_size = file.ReadUInt32(); uint header_size = file.ReadUInt32();
if (size < 14+header_size) if (size < 14+header_size)
{ {
@ -147,7 +148,7 @@ namespace GameRes
OffsetY = 0, OffsetY = 0,
BPP = bpp, BPP = bpp,
ImageLength = size, ImageLength = size,
HeaderLength = header_size + 14, ImageOffset = image_offset,
}; };
} }
} }
@ -160,7 +161,7 @@ namespace GameRes
if (file.AsStream.CanSeek) if (file.AsStream.CanSeek)
{ {
var width_x_height = info.Width * info.Height; var width_x_height = info.Width * info.Height;
uint bmp_length = width_x_height * (uint)info.BPP/8 + info.HeaderLength; uint bmp_length = width_x_height * (uint)info.BPP/8 + info.ImageOffset;
if (bmp_length == info.ImageLength || bmp_length+2 == info.ImageLength) if (bmp_length == info.ImageLength || bmp_length+2 == info.ImageLength)
{ {
if (0x20 == info.BPP) if (0x20 == info.BPP)
@ -183,7 +184,7 @@ namespace GameRes
if (alpha.Length != file.Read (alpha, 0, alpha.Length)) if (alpha.Length != file.Read (alpha, 0, alpha.Length))
throw new EndOfStreamException(); throw new EndOfStreamException();
file.Position = info.HeaderLength; file.Position = info.ImageOffset;
int dst_stride = (int)info.Width * 4; int dst_stride = (int)info.Width * 4;
var pixels = new byte[(int)info.Height * dst_stride]; var pixels = new byte[(int)info.Height * dst_stride];
int a_src = 0; int a_src = 0;
@ -201,7 +202,7 @@ namespace GameRes
private ImageData ReadBitmapBGRA (IBinaryStream file, BmpMetaData info) private ImageData ReadBitmapBGRA (IBinaryStream file, BmpMetaData info)
{ {
file.Position = info.HeaderLength; file.Position = info.ImageOffset;
int stride = (int)info.Width * 4; int stride = (int)info.Width * 4;
var pixels = new byte[(int)info.Height * stride]; var pixels = new byte[(int)info.Height * stride];
bool has_alpha = false; bool has_alpha = false;