Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2025-01-11 12:39:16 +08:00
Code Issues Projects Releases Wiki Activity

(CGF): implemented version 3 images.

Browse Source
This commit is contained in:
morkt 2018-05-10 02:07:45 +04:00
parent 517fcb63d2
commit 346dfd65ba
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ArcFormats/Cadath/ImageCGF.cs
View File

@ -48,7 +48,7 @@ namespace GameRes.Formats.Cadath
{ {
var header = file.ReadHeader (10); var header = file.ReadHeader (10);
int method = header[4]; int method = header[4];
if (method != 1 && method != 2) if (method < 1 || method > 3)
return null; return null;
return new CgfMetaData return new CgfMetaData
{ {
@ -94,14 +94,16 @@ namespace GameRes.Formats.Cadath
public byte[] Unpack () public byte[] Unpack ()
{ {
m_input.Position = 10; m_input.Position = 10;
int pixel_size = m_info.BPP / 8;
Action<byte[], int, byte[]> unpack_channel; Action<byte[], int, byte[]> unpack_channel;
if (1 == m_info.Method) if (1 == m_info.Method)
unpack_channel = UnpackZLib; unpack_channel = UnpackZLibV1;
else if (2 == m_info.Method) else if (2 == m_info.Method)
unpack_channel = UnpackRle; unpack_channel = UnpackRle;
else if (3 == m_info.Method)
unpack_channel = UnpackZLibV3;
else else
throw new NotSupportedException(); throw new NotSupportedException();
int pixel_size = m_info.BPP / 8;
var channel = new byte[m_info.Width * m_info.Height]; var channel = new byte[m_info.Width * m_info.Height];
byte[] buffer = null; byte[] buffer = null;
for (int i = 0; i < pixel_size; ++i) for (int i = 0; i < pixel_size; ++i)
@ -124,9 +126,25 @@ namespace GameRes.Formats.Cadath
return m_output; return m_output;
} }
void UnpackZLib (byte[] input, int length, byte[] output) void UnpackZLibV1 (byte[] input, int length, byte[] output)
{ {
Decrypt (input, length); Decrypt (input, length);
UnpackZLib (input, length, output);
}
void UnpackZLibV3 (byte[] input, int length, byte[] output)
{
UnpackZLib (input, length, output);
byte px = 0;
for (int i = 0; i < output.Length; ++i)
{
px ^= output[i];
output[i] = px;
}
}
void UnpackZLib (byte[] input, int length, byte[] output)
{
using (var zinput = new MemoryStream (input, 4, length - 4)) using (var zinput = new MemoryStream (input, 4, length - 4))
using (var z = new ZLibStream (zinput, CompressionMode.Decompress)) using (var z = new ZLibStream (zinput, CompressionMode.Decompress))
z.Read (output, 0, output.Length); z.Read (output, 0, output.Length);