From 33185f3f2b7ad8867b3be206f83d08a2f485470d Mon Sep 17 00:00:00 2001 From: "Michael \"Code Poet\" Pohoreski" Date: Mon, 10 Apr 2023 14:33:55 -0700 Subject: [PATCH] Update BMP import from GIMP 2.10 with X8 R8 G8 B8 (#1209) --- docs/Debugger_Changelog.txt | 12 ++++++++++++ source/Debugger/Debug.cpp | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt index 600aa9f7..163e1164 100644 --- a/docs/Debugger_Changelog.txt +++ b/docs/Debugger_Changelog.txt @@ -1,4 +1,16 @@ /* +2.9.1.18 Fixed: NTSC LOAD was failing to import BMPs exported from GIMP. + To export a 64x256 bitmap from GIMP: + 1. File, Export As... + 2. Use a file extension of .bmp + 3. Export Image as BMP + Compatibility Options + [x] Do not write color space information + Advanced Options + 32 Bits + (x) X8 R8 G8 B8 + In the debugger load your .bmp file: + NTSC LOAD palette.bmp 2.9.1.17 Fixed: Ctrl-Space failing to step over a long sub-routine (and wasn't providing any feedback on why it failed.) GH #1194 Increased the max steps to 0xFFFFF (from 0xFFFF) If step-over succeeds the debugger's feedback is: diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index 76914545..fd27f938 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define MAKE_VERSION(a,b,c,d) ((a<<24) | (b<<16) | (c<<8) | (d)) // See /docs/Debugger_Changelog.txt for full details - const int DEBUGGER_VERSION = MAKE_VERSION(2,9,1,17); + const int DEBUGGER_VERSION = MAKE_VERSION(2,9,1,18); // Public _________________________________________________________________________________________ @@ -5542,6 +5542,10 @@ Update_t CmdNTSC (int nArgs) && (bmp.nGreenMask == 0x00FF0000 ) && (bmp.nBlueMask == 0x0000FF00 )) bSwizzle = true; + if ((bmp.nRedMask == 0x00FF0000 ) // Gimp 32 Bits, X8 R8 G8 B8 + && (bmp.nGreenMask == 0x0000FF00 ) + && (bmp.nBlueMask == 0x000000FF )) + bSwizzle = false; } } }