From d5a073741a9e9dba9e89695a2b513cc4bb5e9994 Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 23 Aug 2022 22:56:47 -0400 Subject: [PATCH] ModernDeemphColorMap const args --- src/drivers/common/vidblit.cpp | 12 ++++++------ src/drivers/common/vidblit.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/drivers/common/vidblit.cpp b/src/drivers/common/vidblit.cpp index b2fbda24..6fcdac4e 100644 --- a/src/drivers/common/vidblit.cpp +++ b/src/drivers/common/vidblit.cpp @@ -466,7 +466,7 @@ void Blit8To8(uint8 *src, uint8 *dest, int xr, int yr, int pitch, int xscale, in /* Todo: Make sure 24bpp code works right with big-endian cpus */ //takes a pointer to XBuf and applies fully modern deemph palettizing -template static u32 _ModernDeemphColorMap(u8* src, u8* srcbuf) +template static u32 _ModernDeemphColorMap(const u8* src, const u8* srcbuf) { u8 pixel = *src; @@ -492,7 +492,7 @@ template static u32 _ModernDeemphColorMap(u8* src, u8* srcbuf) return color; } -u32 ModernDeemphColorMap(u8* src, u8* srcbuf, int scale) +u32 ModernDeemphColorMap(const u8* src, const u8* srcbuf, int scale) { if(scale == 1) return _ModernDeemphColorMap<1>(src,srcbuf); else if(scale == 2) return _ModernDeemphColorMap<2>(src,srcbuf); @@ -503,14 +503,14 @@ u32 ModernDeemphColorMap(u8* src, u8* srcbuf, int scale) else if(scale == 7) return _ModernDeemphColorMap<7>(src,srcbuf); else if(scale == 8) return _ModernDeemphColorMap<8>(src,srcbuf); else if(scale == 9) return _ModernDeemphColorMap<9>(src,srcbuf); - else { abort(); return 0; } + else { FCEU_abort("unhandled ModernDeemphColorMap scale"); return 0; } } -typedef u32 (*ModernDeemphColorMapFuncPtr)( u8*, u8* ); +typedef u32 (*ModernDeemphColorMapFuncPtr)( const u8*, const u8* ); static ModernDeemphColorMapFuncPtr getModernDeemphColorMapFunc(int scale) { - ModernDeemphColorMapFuncPtr ptr = NULL; + ModernDeemphColorMapFuncPtr ptr; if(scale == 1) ptr = &_ModernDeemphColorMap<1>; else if(scale == 2) ptr = &_ModernDeemphColorMap<2>; @@ -521,7 +521,7 @@ static ModernDeemphColorMapFuncPtr getModernDeemphColorMapFunc(int scale) else if(scale == 7) ptr = &_ModernDeemphColorMap<7>; else if(scale == 8) ptr = &_ModernDeemphColorMap<8>; else if(scale == 9) ptr = &_ModernDeemphColorMap<9>; - else { abort(); ptr = NULL; } + else { FCEU_abort("unhandled ModernDeemphColorMap scale"); ptr = nullptr; } return ptr; } diff --git a/src/drivers/common/vidblit.h b/src/drivers/common/vidblit.h index d9581b0b..ba35b937 100644 --- a/src/drivers/common/vidblit.h +++ b/src/drivers/common/vidblit.h @@ -29,4 +29,4 @@ void Blit32to16(uint32 *src, uint16 *dest, int xr, int yr, int dpitch, int shiftr[3], int shiftl[3]); -u32 ModernDeemphColorMap(u8* src, u8* srcbuf, int scale); \ No newline at end of file +u32 ModernDeemphColorMap(const u8* src, const u8* srcbuf, int scale);