Update BMP import from GIMP 2.10 with X8 R8 G8 B8 (#1209)

This commit is contained in:
Michael "Code Poet" Pohoreski 2023-04-10 14:33:55 -07:00 committed by GitHub
parent c4e8733b95
commit 33185f3f2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions

View File

@ -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 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) Increased the max steps to 0xFFFFF (from 0xFFFF)
If step-over succeeds the debugger's feedback is: If step-over succeeds the debugger's feedback is:

View File

@ -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)) #define MAKE_VERSION(a,b,c,d) ((a<<24) | (b<<16) | (c<<8) | (d))
// See /docs/Debugger_Changelog.txt for full details // 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 _________________________________________________________________________________________ // Public _________________________________________________________________________________________
@ -5542,6 +5542,10 @@ Update_t CmdNTSC (int nArgs)
&& (bmp.nGreenMask == 0x00FF0000 ) && (bmp.nGreenMask == 0x00FF0000 )
&& (bmp.nBlueMask == 0x0000FF00 )) && (bmp.nBlueMask == 0x0000FF00 ))
bSwizzle = true; bSwizzle = true;
if ((bmp.nRedMask == 0x00FF0000 ) // Gimp 32 Bits, X8 R8 G8 B8
&& (bmp.nGreenMask == 0x0000FF00 )
&& (bmp.nBlueMask == 0x000000FF ))
bSwizzle = false;
} }
} }
} }