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

(IphFormat): check for RIFF signature prior to creating Reader object.

Browse Source
This commit is contained in:
morkt 2016-04-09 00:38:57 +04:00
parent c7db912dc6
commit fc271fde84
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ArcFormats/TechnoBrain/ImageIPH.cs
View File

@ -46,11 +46,11 @@ namespace GameRes.Formats.TechnoBrain
public override ImageMetaData ReadMetaData (Stream stream) public override ImageMetaData ReadMetaData (Stream stream)
{ {
// 'RIFF' isn't included into signature to avoid auto-detection of the WAV files as IPH images.
if (0x46464952 != FormatCatalog.ReadSignature (stream)) // 'RIFF'
return null;
using (var reader = new ArcView.Reader (stream)) using (var reader = new ArcView.Reader (stream))
{ {
// 'RIFF' isn't included into signature to avoid auto-detection of the WAV files as IPH images.
if (0x46464952 != reader.ReadInt32()) // 'RIFF'
return null;
if (0x38 != reader.ReadInt32()) if (0x38 != reader.ReadInt32())
return null; return null;
var signature = reader.ReadInt32(); var signature = reader.ReadInt32();
@ -75,10 +75,9 @@ namespace GameRes.Formats.TechnoBrain
public override ImageData Read (Stream stream, ImageMetaData info) public override ImageData Read (Stream stream, ImageMetaData info)
{ {
var meta = (IphMetaData)info; if (info.BPP != 16)
if (meta.BPP != 16)
throw new NotSupportedException ("Not supported IPH color depth"); throw new NotSupportedException ("Not supported IPH color depth");
using (var reader = new IphReader (stream, meta)) using (var reader = new IphReader (stream, (IphMetaData)info))
{ {
reader.Unpack(); reader.Unpack();
return ImageData.Create (info, reader.Format, null, reader.Data); return ImageData.Create (info, reader.Format, null, reader.Data);