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

(DetBmpFormat): added signature.

Browse Source
This commit is contained in:
morkt 2018-02-02 03:28:12 +04:00
parent c46ed676d4
commit 3174b6c3df
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ArcFormats/uGOS/ImageBMP.cs
View File

@ -46,7 +46,7 @@ namespace GameRes.Formats.uGOS
public DetBmpFormat () public DetBmpFormat ()
{ {
Extensions = new string[] { "bmp" }; Extensions = new string[] { "bmp" };
Signatures = new uint[] { 0x206546, 0x186546, 0x01186446, 0 }; Signatures = new uint[] { 0x206546, 0x186546, 0x01186446, 0x186446, 0 };
} }
public override ImageMetaData ReadMetaData (IBinaryStream stream) public override ImageMetaData ReadMetaData (IBinaryStream stream)
@ -71,7 +71,7 @@ namespace GameRes.Formats.uGOS
public override ImageData Read (IBinaryStream file, ImageMetaData info) public override ImageData Read (IBinaryStream file, ImageMetaData info)
{ {
using (var reader = new Reader (file, info)) using (var reader = new Reader (file, (DetBmpMetaData)info))
{ {
reader.Unpack(); reader.Unpack();
return ImageData.CreateFlipped (info, reader.Format, null, reader.Data, reader.Stride); return ImageData.CreateFlipped (info, reader.Format, null, reader.Data, reader.Stride);
@ -95,7 +95,7 @@ namespace GameRes.Formats.uGOS
public byte[] Data { get { return m_output; } } public byte[] Data { get { return m_output; } }
public int Stride { get; private set; } public int Stride { get; private set; }
public Reader (IBinaryStream input, ImageMetaData info) public Reader (IBinaryStream input, DetBmpMetaData info)
{ {
m_input = input; m_input = input;
m_width = (int)info.Width; m_width = (int)info.Width;
@ -300,28 +300,25 @@ namespace GameRes.Formats.uGOS
byte sub_415530 (int a3) byte sub_415530 (int a3)
{ {
m_bits &= 0xFF; m_bits &= 0xFF;
uint v3 = m_bits;
int v4 = byte_4CBA80[m_bits]; int v4 = byte_4CBA80[m_bits];
int v5 = a3 - v4; int v5 = a3 - v4;
uint alpha; // eax@5 uint alpha; // eax@5
if (a3 - v4 <= 0) if (v5 <= 0)
{ {
alpha = v3 >> (8 - a3); alpha = m_bits >> (8 - a3);
m_bits = (byte)(v3 << a3); m_bits = (m_bits << a3) & 0xFF;
} }
else else
{ {
int v6 = (int)(v3 >> (8 - v4)); int v6 = (int)(m_bits >> (8 - v4));
if ((uint)v5 > 8) if (v5 > 8)
{ {
uint v7 = ((uint)(v5 - 9) >> 3) + 1; int count = ((v5 - 9) >> 3) + 1;
do while (count --> 0)
{ {
v6 = m_input.ReadUInt8() + (v6 << 8); v6 = m_input.ReadUInt8() + (v6 << 8);
v5 -= 8; v5 -= 8;
--v7;
} }
while (0 != v7);
} }
m_bits = m_input.ReadUInt8(); m_bits = m_input.ReadUInt8();
alpha = (uint)((v6 << v5) + (m_bits >> (8 - v5))); alpha = (uint)((v6 << v5) + (m_bits >> (8 - v5)));