From 7488551335a3d6476906c7baaf8cf8b7bd577bd8 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Tue, 6 Aug 2024 18:01:24 -0400
Subject: [PATCH] add BitmapFormat enum, update Reformat

---
 src/app/gfx/bitmap.cc |  3 +++
 src/app/gfx/bitmap.h  | 16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/gfx/bitmap.cc b/src/app/gfx/bitmap.cc
index 187056c0..8606c5e5 100644
--- a/src/app/gfx/bitmap.cc
+++ b/src/app/gfx/bitmap.cc
@@ -241,6 +241,9 @@ void Bitmap::Reformat(int format) {
                                      GetSnesPixelFormat(format)),
       SDL_Surface_Deleter());
   surface_->pixels = pixel_data_;
+  if (!ApplyPalette(palette_).ok()) {
+    // Some sort of error occurred, throw an exception?
+  }
   active_ = true;
 }
 
diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h
index 09cbf4cc..3e83c7c9 100644
--- a/src/app/gfx/bitmap.h
+++ b/src/app/gfx/bitmap.h
@@ -22,6 +22,10 @@ namespace app {
  */
 namespace gfx {
 
+// Same as SDL_PIXELFORMAT_INDEX8 for reference
+constexpr Uint32 SNES_PIXELFORMAT_INDEXED =
+    SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1);
+
 constexpr Uint32 SNES_PIXELFORMAT_2BPP = SDL_DEFINE_PIXELFORMAT(
     /*type=*/SDL_PIXELTYPE_INDEX8, /*order=*/0,
     /*layouts=*/0, /*bits=*/2, /*bytes=*/1);
@@ -34,12 +38,12 @@ constexpr Uint32 SNES_PIXELFORMAT_8BPP = SDL_DEFINE_PIXELFORMAT(
     /*type=*/SDL_PIXELTYPE_INDEX8, /*order=*/0,
     /*layouts=*/0, /*bits=*/8, /*bytes=*/1);
 
-// SDL_PIXELFORMAT_INDEX8 =
-// SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1),
-
-constexpr int kFormat2bppIndexed = 1;
-constexpr int kFormat4bppIndexed = 2;
-constexpr int kFormat8bppIndexed = 3;
+enum BitmapFormat {
+  kIndexed = 0,
+  k2bpp = 1,
+  k4bpp = 2,
+  k8bpp = 3,
+};
 
 /**
  * @brief Convert SDL_Surface to PNG image data.