From cb5dc9c7266845e2d13b6a4ddc8cb4cbf24317e0 Mon Sep 17 00:00:00 2001 From: morkt Date: Sat, 14 Jan 2017 17:03:19 +0400 Subject: [PATCH] (McgDecoder): use ImageFormat.ReadPalette. --- ArcFormats/FC01/ImageMCG.cs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/ArcFormats/FC01/ImageMCG.cs b/ArcFormats/FC01/ImageMCG.cs index 1cd30cad..9b4a120d 100644 --- a/ArcFormats/FC01/ImageMCG.cs +++ b/ArcFormats/FC01/ImageMCG.cs @@ -189,7 +189,7 @@ namespace GameRes.Formats.FC01 int input_size = m_info.PackedSize; if (8 == m_info.BPP) { - ReadPalette(); + Palette = ImageFormat.ReadPalette (m_file.AsStream); input_size -= 0x400; } m_input = m_file.ReadBytes (input_size); @@ -314,18 +314,5 @@ namespace GameRes.Formats.FC01 m_output[dst++] = (byte)(r + g); } } - - void ReadPalette () - { - var palette_data = m_file.ReadBytes (0x400); - int src = 0; - var colors = new Color[0x100]; - for (int i = 0; i < 0x100; ++i) - { - colors[i] = Color.FromRgb (palette_data[src+2], palette_data[src+1], palette_data[src]); - src += 4; - } - Palette = new BitmapPalette (colors); - } } }