From e117b4a40087fbd34152d73e236713ca6fe480c1 Mon Sep 17 00:00:00 2001 From: Michael Sparmann Date: Mon, 25 Oct 2010 12:43:23 +0000 Subject: Fix yellow: BMP_BPP and BMP_LINESIZE being used both in greylib and screendump git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28357 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/screendump.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/firmware/export/screendump.h b/firmware/export/screendump.h index 9be1f5d3f2..b7acdd344c 100644 --- a/firmware/export/screendump.h +++ b/firmware/export/screendump.h @@ -39,20 +39,29 @@ #define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff #define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff +#ifndef BMP_BPP #if LCD_DEPTH <= 4 #define BMP_BPP 4 -#define BMP_LINESIZE ((LCD_WIDTH/2 + 3) & ~3) #elif LCD_DEPTH <= 8 #define BMP_BPP 8 -#define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3) #elif LCD_DEPTH <= 16 #define BMP_BPP 16 -#define BMP_LINESIZE ((LCD_WIDTH*2 + 3) & ~3) #else #define BMP_BPP 24 -#define BMP_LINESIZE ((LCD_WIDTH*3 + 3) & ~3) +#endif #endif +#ifndef BMP_LINESIZE +#if LCD_DEPTH <= 4 +#define BMP_LINESIZE ((LCD_WIDTH/2 + 3) & ~3) +#elif LCD_DEPTH <= 8 +#define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3) +#elif LCD_DEPTH <= 16 +#define BMP_LINESIZE ((LCD_WIDTH*2 + 3) & ~3) +#else +#define BMP_LINESIZE ((LCD_WIDTH*3 + 3) & ~3) +#endif +#endif #ifdef BOOTLOADER -- cgit v1.2.3