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

(GAL): fixed jpeg unpacker.

Browse Source
This commit is contained in:
morkt 2017-03-05 21:52:05 +04:00
parent 9606b673c2
commit 859a327f65
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArcFormats/LiveMaker/ImageGAL.cs
View File

@ -276,7 +276,7 @@ namespace GameRes.Formats.LiveMaker
if (0 == m_info.Compression || 2 == m_info.Compression && is_alpha) if (0 == m_info.Compression || 2 == m_info.Compression && is_alpha)
return ReadZlib (frame, packed, is_alpha); return ReadZlib (frame, packed, is_alpha);
if (2 == m_info.Compression) if (2 == m_info.Compression)
return ReadJpeg (frame, packed); return ReadJpeg (frame, packed, is_alpha);
return ReadBlocks (frame, packed, is_alpha); return ReadBlocks (frame, packed, is_alpha);
} }
} }
@ -331,7 +331,7 @@ namespace GameRes.Formats.LiveMaker
{ {
int frame_ref = refs[i]; int frame_ref = refs[i];
int layer_ref = refs[i+1]; int layer_ref = refs[i+1];
if (frame_ref > m_frames.Count || layer_ref > m_frames[frame_ref].Layers.Count) if (frame_ref >= m_frames.Count || layer_ref >= m_frames[frame_ref].Layers.Count)
throw new InvalidFormatException(); throw new InvalidFormatException();
var layer = m_frames[frame_ref].Layers[layer_ref]; var layer = m_frames[frame_ref].Layers[layer_ref];
byte[] src = is_alpha ? layer.Alpha : layer.Pixels; byte[] src = is_alpha ? layer.Alpha : layer.Pixels;
@ -371,7 +371,7 @@ namespace GameRes.Formats.LiveMaker
return ReadBlocks (frame, zs, is_alpha); return ReadBlocks (frame, zs, is_alpha);
} }
byte[] ReadJpeg (Frame frame, Stream packed) byte[] ReadJpeg (Frame frame, Stream packed, bool is_alpha)
{ {
var decoder = new JpegBitmapDecoder (packed, BitmapCreateOptions.None, BitmapCacheOption.OnLoad); var decoder = new JpegBitmapDecoder (packed, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
var bitmap = decoder.Frames[0]; var bitmap = decoder.Frames[0];
@ -379,6 +379,8 @@ namespace GameRes.Formats.LiveMaker
int stride = bitmap.PixelWidth * bitmap.Format.BitsPerPixel / 8; int stride = bitmap.PixelWidth * bitmap.Format.BitsPerPixel / 8;
var pixels = new byte[bitmap.PixelHeight * stride]; var pixels = new byte[bitmap.PixelHeight * stride];
bitmap.CopyPixels (pixels, stride, 0); bitmap.CopyPixels (pixels, stride, 0);
if (!is_alpha)
frame.Stride = stride;
return pixels; return pixels;
} }