(BET): recognize non-compressed images.

This commit is contained in:
morkt 2017-12-31 09:04:16 +04:00
parent 31e420c094
commit 913d6e6817

View File

@ -23,6 +23,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
// //
using System;
using System.ComponentModel.Composition; using System.ComponentModel.Composition;
using System.IO; using System.IO;
using System.Windows.Media; using System.Windows.Media;
@ -35,53 +36,36 @@ namespace GameRes.Formats.System21
public class BetFormat : ImageFormat public class BetFormat : ImageFormat
{ {
public override string Tag { get { return "BET"; } } public override string Tag { get { return "BET"; } }
public override string Description { get { return "System21 compressed image format"; } } public override string Description { get { return "System21 image format"; } }
public override uint Signature { get { return 0x44445A53; } } // 'SZDD' public override uint Signature { get { return 0; } }
public override ImageMetaData ReadMetaData (IBinaryStream file) public override ImageMetaData ReadMetaData (IBinaryStream file)
{ {
if (!file.Name.HasExtension (".bet")) if (!file.Name.HasExtension (".bet"))
return null; return null;
using (var lz = OpenLzStream (file.AsStream)) uint w = file.ReadUInt32();
using (var input = new BinaryStream (lz, file.Name)) uint h = file.ReadUInt32();
{ int bpp = file.ReadUInt16();
uint w = input.ReadUInt32(); if ((bpp != 24 && bpp != 8) || 0 == w || w > 0x8000 || 0 == h || h > 0x8000)
uint h = input.ReadUInt32(); return null;
int bpp = input.ReadUInt16(); return new ImageMetaData { Width = w, Height = h, BPP = bpp };
if ((bpp != 24 && bpp != 8) || 0 == w || w > 0x8000 || 0 == h || h > 0x8000)
return null;
return new ImageMetaData { Width = w, Height = h, BPP = bpp };
}
} }
public override ImageData Read (IBinaryStream file, ImageMetaData info) public override ImageData Read (IBinaryStream input, ImageMetaData info)
{ {
using (var input = OpenLzStream (file.AsStream)) int stride = (int)info.Width * info.BPP / 8;
{ int bitmap_length = stride * (int)info.Height;
int stride = (int)info.Width * info.BPP / 8; var pixels = new byte[Math.Max (bitmap_length, 10)];
var pixels = new byte[stride * (int)info.Height]; input.Read (pixels, 0, 10); // input might be non-seekable
for (int i = 0; i < 10; ++i) BitmapPalette palette = null;
input.ReadByte(); if (8 == info.BPP)
BitmapPalette palette = null; palette = ReadPalette (input.AsStream);
if (8 == info.BPP) if (input.Read (pixels, 0, bitmap_length) != bitmap_length)
palette = ReadPalette (input); throw new InvalidFormatException();
if (input.Read (pixels, 0, pixels.Length) != pixels.Length) for (int i = 0; i < bitmap_length; ++i)
throw new InvalidFormatException(); pixels[i] ^= 0xFF;
for (int i = 0; i < pixels.Length; ++i) PixelFormat format = 8 == info.BPP ? PixelFormats.Indexed8 : PixelFormats.Bgr24;
pixels[i] ^= 0xFF; return ImageData.CreateFlipped (info, format, palette, pixels, stride);
PixelFormat format = 8 == info.BPP ? PixelFormats.Indexed8 : PixelFormats.Bgr24;
return ImageData.CreateFlipped (info, format, palette, pixels, stride);
}
}
Stream OpenLzStream (Stream input)
{
input.Position = 0xE;
var lz = new LzssStream (input, LzssMode.Decompress, true);
lz.Config.FrameSize = 0x1000;
lz.Config.FrameFill = 0x20;
lz.Config.FrameInitPos = 0x1000 - 0x10;
return lz;
} }
public override void Write (Stream file, ImageData image) public override void Write (Stream file, ImageData image)
@ -89,4 +73,42 @@ namespace GameRes.Formats.System21
throw new System.NotImplementedException ("BetFormat.Write not implemented"); throw new System.NotImplementedException ("BetFormat.Write not implemented");
} }
} }
[Export(typeof(ImageFormat))]
public class LzBetFormat : BetFormat
{
public override string Tag { get { return "BET/SZDD"; } }
public override string Description { get { return "System21 compressed image format"; } }
public override uint Signature { get { return 0x44445A53; } } // 'SZDD'
public override bool CanWrite { get { return false; } }
public override ImageMetaData ReadMetaData (IBinaryStream file)
{
if (!file.Name.HasExtension (".bet"))
return null;
using (var input = OpenLzStream (file))
return base.ReadMetaData (input);
}
public override ImageData Read (IBinaryStream file, ImageMetaData info)
{
using (var input = OpenLzStream (file))
return base.Read (input, info);
}
IBinaryStream OpenLzStream (IBinaryStream input)
{
input.Position = 0xE;
var lz = new LzssStream (input.AsStream, LzssMode.Decompress, true);
lz.Config.FrameSize = 0x1000;
lz.Config.FrameFill = 0x20;
lz.Config.FrameInitPos = 0x1000 - 0x10;
return new BinaryStream (lz, input.Name); // XXX stream is unseekable
}
public override void Write (Stream file, ImageData image)
{
throw new System.NotImplementedException ("LzBetFormat.Write not implemented");
}
}
} }