From cb865b597748be2802cc16f840712997e2dbfda2 Mon Sep 17 00:00:00 2001
From: ManicSteiner <manicsteiner@outlook.com>
Date: Sat, 18 Jan 2025 22:45:40 +0800
Subject: [PATCH] RGBX-RGBA7

---
 ArcFormats/DigitalWorks/ImageTM2.cs | 14 +++++++-------
 GameRes/Image.cs                    | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ArcFormats/DigitalWorks/ImageTM2.cs b/ArcFormats/DigitalWorks/ImageTM2.cs
index 25310143..0be8eab1 100644
--- a/ArcFormats/DigitalWorks/ImageTM2.cs
+++ b/ArcFormats/DigitalWorks/ImageTM2.cs
@@ -37,7 +37,7 @@ namespace GameRes.Formats.DigitalWorks
         public int  PaletteSize;
         public int  HeaderSize;
         public int  Colors;
-        public byte X_A;
+        public byte Alpha;
     }
 
     [Export(typeof(ImageFormat))]
@@ -87,7 +87,7 @@ namespace GameRes.Formats.DigitalWorks
                 PaletteSize = header.ToInt32 (0x14),
                 HeaderSize = header.ToUInt16 (0x1C),
                 Colors  = header.ToUInt16 (0x1E),
-                X_A = alpha, //header.ToUInt16(0x30) == 0?// not so sure, there will be omissions
+                Alpha = alpha, //header.ToUInt16(0x30) == 0?// not so sure, there will be omissions
             };
         }
 
@@ -132,9 +132,9 @@ namespace GameRes.Formats.DigitalWorks
             int image_size = (int)m_info.Width * (int)m_info.Height * pixel_size;
             var output = m_input.ReadBytes (image_size);
             if (pixel_size <= 8 && m_info.Colors > 0)
-                Palette = ReadPalette (m_info.Colors, m_info.X_A);
+                Palette = ReadPalette (m_info.Colors, m_info.Alpha);
 
-            if (pixel_size == 3 || pixel_size == 4 && m_info.X_A == 8)
+            if (pixel_size == 3 || pixel_size == 4 && m_info.Alpha == 8)
             {
                 for (int i = 0; i < image_size; i += pixel_size)
                 {
@@ -143,7 +143,7 @@ namespace GameRes.Formats.DigitalWorks
                     output[i+2] = r;
                 }
             }
-            if (pixel_size == 4 && m_info.X_A == 7)
+            if (pixel_size == 4 && m_info.Alpha == 7)
             {
                 for (int i = 0; i < image_size; i += 4)
                 {
@@ -156,7 +156,7 @@ namespace GameRes.Formats.DigitalWorks
                         output[i + 3] = (byte)(output[i + 3] << 1);
                 }
             }
-            if (pixel_size == 4 && m_info.X_A == 0)
+            if (pixel_size == 4 && m_info.Alpha == 0)
             {
                 for (int i = 0; i < image_size; i += 4)
                 {
@@ -172,7 +172,7 @@ namespace GameRes.Formats.DigitalWorks
         BitmapPalette ReadPalette (int color_num, byte X_A = 8)
         {
             var source = ImageFormat.ReadColorMap (m_input.AsStream,
-                color_num, X_A == 7 ? PaletteFormat.RgbX : X_A == 0 ? PaletteFormat.RgbX_Disposed : PaletteFormat.RgbA);
+                color_num, X_A == 7 ? PaletteFormat.RgbA7 : X_A == 0 ? PaletteFormat.RgbX : PaletteFormat.RgbA);
             var color_map = new Color[color_num];
 
             int parts = color_num / 32;
diff --git a/GameRes/Image.cs b/GameRes/Image.cs
index 0644a8c8..f3680ea4 100644
--- a/GameRes/Image.cs
+++ b/GameRes/Image.cs
@@ -71,8 +71,8 @@ namespace GameRes
         BgrX    = 6,
         RgbA    = 9,
         BgrA    = 10,
-        RgbX_Disposed = 55,
-        BgrX_Disposed = 66,
+        RgbA7 = 55,
+        BgrA7 = 66,
     }
 
     public class ImageData
@@ -215,15 +215,15 @@ namespace GameRes
             int src = 0;
             var color_map = new Color[colors];
             Func<int, Color> get_color;
-            if (PaletteFormat.Bgr == format || PaletteFormat.BgrX_Disposed == format)
+            if (PaletteFormat.Bgr == format || PaletteFormat.BgrX == format)
                 get_color = x => Color.FromRgb (palette_data[x+2], palette_data[x+1], palette_data[x]);
-            else if (PaletteFormat.BgrX == format)
+            else if (PaletteFormat.BgrA7 == format)
                 get_color = x => Color.FromArgb(palette_data[x+3] >= byte.MaxValue / 2 ? byte.MaxValue : (byte)(palette_data[x+3] << 1), palette_data[x+2], palette_data[x+1], palette_data[x]);
             else if (PaletteFormat.BgrA == format)
                 get_color = x => Color.FromArgb (palette_data[x+3], palette_data[x+2], palette_data[x+1], palette_data[x]);
             else if (PaletteFormat.RgbA == format)
                 get_color = x => Color.FromArgb (palette_data[x+3], palette_data[x], palette_data[x+1], palette_data[x+2]);
-            else if (PaletteFormat.RgbX == format)
+            else if (PaletteFormat.RgbA7 == format)
                 get_color = x => Color.FromArgb (palette_data[x+3] >= byte.MaxValue / 2 ? byte.MaxValue : (byte)(palette_data[x+3] << 1), palette_data[x], palette_data[x+1], palette_data[x+2]);
             else
                 get_color = x => Color.FromRgb (palette_data[x], palette_data[x+1], palette_data[x+2]);