lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(AkbReader.Unpack): simplified if/else branching.

Browse Source
This commit is contained in:
morkt
2015-11-29 09:05:03 +04:00
parent dea492a27f
commit da51f3d7b2
1 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ArcFormats/Silky/ImageAKB.cs
View File

@@ -100,24 +100,25 @@ namespace GameRes.Formats.Silky
public byte[] Unpack () public byte[] Unpack ()
{ {
byte[] image; if (0 == m_info.InnerWidth || 0 == m_info.InnerHeight)
if (m_info.InnerWidth != 0 && m_info.InnerHeight != 0) return CreateBackground();
{
m_input.Position = 0x20; m_input.Position = 0x20;
int inner_stride = m_info.InnerWidth * m_pixel_size; int inner_stride = m_info.InnerWidth * m_pixel_size;
var pixels = new byte[m_info.InnerHeight * inner_stride]; var pixels = new byte[m_info.InnerHeight * inner_stride];
using (var lz = new LzssStream (m_input, LzssMode.Decompress, true)) using (var lz = new LzssStream (m_input, LzssMode.Decompress, true))
{ {
for (int dst = pixels.Length - inner_stride; dst >= 0; dst -= inner_stride) for (int pos = pixels.Length - inner_stride; pos >= 0; pos -= inner_stride)
{ {
if (inner_stride != lz.Read (pixels, dst, inner_stride)) if (inner_stride != lz.Read (pixels, pos, inner_stride))
throw new InvalidFormatException(); throw new InvalidFormatException();
} }
} }
RestoreDelta (pixels, inner_stride); RestoreDelta (pixels, inner_stride);
if (m_info.InnerWidth != m_info.Width || m_info.InnerHeight != m_info.Height) if (m_info.InnerWidth == m_info.Width && m_info.InnerHeight == m_info.Height)
{ return pixels;
image = CreateBackground();
var image = CreateBackground();
int src = 0; int src = 0;
int dst = m_info.OffsetY * Stride + m_info.OffsetX * m_pixel_size; int dst = m_info.OffsetY * Stride + m_info.OffsetX * m_pixel_size;
for (int y = 0; y < m_info.InnerHeight; ++y) for (int y = 0; y < m_info.InnerHeight; ++y)
@@ -126,16 +127,6 @@ namespace GameRes.Formats.Silky
dst += Stride; dst += Stride;
src += inner_stride; src += inner_stride;
} }
}
else
{
image = pixels;
}
}
else
{
image = CreateBackground();
}
return image; return image;
} }