Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-23 21:55:34 +08:00
Code Issues Projects Releases Wiki Activity

(HG3): fixed Jpeg reader (#214)

Browse Source
This commit is contained in:
morkt 2018-11-02 06:14:02 +04:00
parent a711f02e45
commit 63e321ca62
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArcFormats/CatSystem/ImageHG3.cs
View File

@ -288,9 +288,12 @@ namespace GameRes.Formats.CatSystem
m_input.ReadInt32(); m_input.ReadInt32();
var jpeg_size = m_input.ReadInt32(); var jpeg_size = m_input.ReadInt32();
long next_section = Source.Position + jpeg_size; long next_section = Source.Position + jpeg_size;
var decoder = new JpegBitmapDecoder (Source, BitmapSource frame;
BitmapCreateOptions.None, BitmapCacheOption.OnLoad); using (var jpeg = new StreamRegion (Source, Source.Position, jpeg_size, true))
var frame = decoder.Frames[0]; {
var decoder = new JpegBitmapDecoder (jpeg, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
frame = decoder.Frames[0];
}
if (frame.Format.BitsPerPixel < 24) if (frame.Format.BitsPerPixel < 24)
throw new NotSupportedException ("Not supported HG-3 JPEG color depth"); throw new NotSupportedException ("Not supported HG-3 JPEG color depth");
int src_pixel_size = frame.Format.BitsPerPixel/8; int src_pixel_size = frame.Format.BitsPerPixel/8;
@ -303,9 +306,9 @@ namespace GameRes.Formats.CatSystem
int dst = 0; int dst = 0;
for (uint i = 0; i < total; ++i) for (uint i = 0; i < total; ++i)
{ {
output[dst++] = pixels[src];
output[dst++] = pixels[src+1];
output[dst++] = pixels[src+2]; output[dst++] = pixels[src+2];
output[dst++] = pixels[src+1];
output[dst++] = pixels[src];
output[dst++] = 0xFF; output[dst++] = 0xFF;
src += src_pixel_size; src += src_pixel_size;
} }