Fixed: on a second thought, let's just make FileImageReader fall back to guessed image if possible...

This commit is contained in:
ZZYZX 2018-03-31 14:01:36 +03:00
parent f7c2a577e4
commit 10167038ae
2 changed files with 91 additions and 18 deletions

View file

@ -58,22 +58,23 @@ namespace CodeImp.DoomBuilder.Data
ilType = DevilImageType.IL_DDS;
//mxd. Check for PCX signature
if (CheckSignature(data, PCX_SIGNATURE))
else if (CheckSignature(data, PCX_SIGNATURE))
ilType = DevilImageType.IL_PCX;
//mxd. Check for JPG signature
if (CheckSignature(data, JPG_SIGNATURE))
else if (CheckSignature(data, JPG_SIGNATURE))
ilType = DevilImageType.IL_JPG;
//mxd. TGA is VERY special in that it doesn't have a proper signature...
if (CheckTgaSignature(data))
else if (CheckTgaSignature(data))
ilType = DevilImageType.IL_TGA;
//
if (ilType != DevilImageType.IL_TYPE_UNKNOWN)
{
FileImageReader ilreader = new FileImageReader(ilType);
if (ilreader.Validate(data))
return ilreader;
FileImageReader ilreader = new FileImageReader(ilType, guessformat, palette);
// also fill in the possible proxy type
return ilreader;
}
/*