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

(TxReader): moved image format logic to BcFormat.

Browse Source
This commit is contained in:
morkt
2017-02-01 16:27:07 +04:00
parent 74844e0bcc
commit 418f12d5d0
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ArcFormats/Tanaka/ImageBC.cs
View File

@@ -77,9 +77,26 @@ namespace GameRes.Formats.Will
public override ImageData Read (IBinaryStream file, ImageMetaData info) public override ImageData Read (IBinaryStream file, ImageMetaData info)
{ {
var reader = new TxReader (file, (TxMetaData)info); var meta = (TxMetaData)info;
PixelFormat format;
BitmapPalette palette = null;
if (24 == info.BPP)
format = PixelFormats.Bgr24;
else if (32 == info.BPP)
format = PixelFormats.Bgra32;
else if (16 == info.BPP)
format = PixelFormats.Bgr555;
else if (8 == info.BPP)
{
format = PixelFormats.Indexed8;
file.Position = 0x36;
palette = ReadPalette (file.AsStream, meta.Colors);
}
else
throw new InvalidFormatException();
var reader = new TxReader (file, meta);
var pixels = reader.Unpack(); var pixels = reader.Unpack();
return ImageData.CreateFlipped (info, reader.Format, reader.Palette, pixels, reader.Stride); return ImageData.CreateFlipped (info, format, palette, pixels, reader.Stride);
} }
public override void Write (Stream file, ImageData image) public override void Write (Stream file, ImageData image)
@@ -94,8 +111,6 @@ namespace GameRes.Formats.Will
TxMetaData m_info; TxMetaData m_info;
byte[] m_output; byte[] m_output;
public PixelFormat Format { get; private set; }
public BitmapPalette Palette { get; private set; }
public byte[] Data { get { return m_output; } } public byte[] Data { get { return m_output; } }
public int Stride { get { return m_info.Stride; } } public int Stride { get { return m_info.Stride; } }
@@ -104,20 +119,6 @@ namespace GameRes.Formats.Will
m_input = input; m_input = input;
m_info = info; m_info = info;
m_output = new byte[m_info.Stride * (int)m_info.Height]; m_output = new byte[m_info.Stride * (int)m_info.Height];
if (24 == m_info.BPP)
Format = PixelFormats.Bgr24;
else if (32 == m_info.BPP)
Format = PixelFormats.Bgra32;
else if (16 == m_info.BPP)
Format = PixelFormats.Bgr555;
else if (8 == m_info.BPP)
{
Format = PixelFormats.Indexed8;
m_input.Position = 0x36;
Palette = ImageFormat.ReadPalette (m_input.AsStream, m_info.Colors);
}
else
throw new InvalidFormatException();
} }
public byte[] Unpack () public byte[] Unpack ()