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

(WebPDecoder): use IBinaryStream instead of BinaryReader.

Browse Source
This commit is contained in:
morkt
2016-12-03 19:17:30 +04:00
parent e2ec6423d1
commit 0b12c7bcef
3 changed files with 25 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ArcFormats/WebP/ImageWEBP.cs
View File

@@ -86,8 +86,8 @@ namespace GameRes.Formats.Google
if (chunk_size != stream.Read (header, 0, chunk_size))
return null;
info.Flags = (WebPFeature)LittleEndian.ToUInt32 (header, 0);
info.Width = 1 + GetUInt24 (header, 4);
info.Height = 1 + GetUInt24 (header, 7);
info.Width = 1 + (uint)header.ToInt24 (4);
info.Height = 1 + (uint)header.ToInt24 (7);
if ((long)info.Width * info.Height >= (1L << 32))
return null;
continue;
@@ -96,7 +96,7 @@ namespace GameRes.Formats.Google
{
info.IsLossless = header[3] == 'L';
info.DataOffset = stream.Position;
info.DataSize = chunk_size;
info.DataSize = aligned_size;
if (!found_vp8x)
{
if (chunk_size < 10 || 10 != stream.Read (header, 0, 10))
@@ -134,18 +134,11 @@ namespace GameRes.Formats.Google
return info;
}
static uint GetUInt24 (byte[] src, int offset)
{
return (uint)(src[offset] | src[offset+1] << 8 | src[offset+2] << 16);
}
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
using (var reader = new WebPDecoder (stream.AsStream, (WebPMetaData)info))
{
reader.Decode();
return ImageData.Create (info, reader.Format, null, reader.Output);
}
var reader = new WebPDecoder (stream, (WebPMetaData)info);
reader.Decode();
return ImageData.Create (info, reader.Format, null, reader.Output);
}
public override void Write (Stream file, ImageData image)