devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix yellow: BMP_BPP and BMP_LINESIZE being used both in greylib and screendump

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28357 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sparmann 2010-10-25 12:43:23 +00:00
parent 01cdb6a21f
commit e117b4a400
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
firmware/export/screendump.h
View file

@ -39,20 +39,29 @@
#define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff #define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff
#define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff #define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff
#ifndef BMP_BPP
#if LCD_DEPTH <= 4 #if LCD_DEPTH <= 4
#define BMP_BPP 4 #define BMP_BPP 4
#define BMP_LINESIZE ((LCD_WIDTH/2 + 3) & ~3)
#elif LCD_DEPTH <= 8 #elif LCD_DEPTH <= 8
#define BMP_BPP 8 #define BMP_BPP 8
#define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3)
#elif LCD_DEPTH <= 16 #elif LCD_DEPTH <= 16
#define BMP_BPP 16 #define BMP_BPP 16
#define BMP_LINESIZE ((LCD_WIDTH*2 + 3) & ~3)
#else #else
#define BMP_BPP 24 #define BMP_BPP 24
#define BMP_LINESIZE ((LCD_WIDTH*3 + 3) & ~3) #endif
#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 #ifdef BOOTLOADER