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

(GalReader.ReadJpeg): is_alpha argument is redundant.

Browse Source
This commit is contained in:
morkt 2017-03-09 10:50:32 +04:00
parent ed048e25f3
commit 1942af2774
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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, is_alpha); return ReadJpeg (frame, packed);
return ReadBlocks (frame, packed, is_alpha); return ReadBlocks (frame, packed, is_alpha);
} }
} }
@ -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, bool is_alpha) byte[] ReadJpeg (Frame frame, Stream packed)
{ {
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,8 +379,7 @@ 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;
frame.Stride = stride;
return pixels; return pixels;
} }