diff options
| author | Michael Sparmann <theseven@rockbox.org> | 2010-10-25 12:43:23 +0000 |
|---|---|---|
| committer | Michael Sparmann <theseven@rockbox.org> | 2010-10-25 12:43:23 +0000 |
| commit | e117b4a40087fbd34152d73e236713ca6fe480c1 (patch) | |
| tree | a0642de24c8fcdc16d2bc4921d7e0271a1613b22 /firmware/export/screendump.h | |
| parent | 01cdb6a21f0a7737bc51c4997d66bd152db694a8 (diff) | |
| download | rockbox-e117b4a40087fbd34152d73e236713ca6fe480c1.tar.gz rockbox-e117b4a40087fbd34152d73e236713ca6fe480c1.zip | |
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
Diffstat (limited to 'firmware/export/screendump.h')
| -rw-r--r-- | firmware/export/screendump.h | 17 |
1 files 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 @@ | |||
| 39 | #define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff | 39 | #define LE16_CONST(x) (x)&0xff, ((x)>>8)&0xff |
| 40 | #define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff | 40 | #define LE32_CONST(x) (x)&0xff, ((x)>>8)&0xff, ((x)>>16)&0xff, ((x)>>24)&0xff |
| 41 | 41 | ||
| 42 | #ifndef BMP_BPP | ||
| 42 | #if LCD_DEPTH <= 4 | 43 | #if LCD_DEPTH <= 4 |
| 43 | #define BMP_BPP 4 | 44 | #define BMP_BPP 4 |
| 44 | #define BMP_LINESIZE ((LCD_WIDTH/2 + 3) & ~3) | ||
| 45 | #elif LCD_DEPTH <= 8 | 45 | #elif LCD_DEPTH <= 8 |
| 46 | #define BMP_BPP 8 | 46 | #define BMP_BPP 8 |
| 47 | #define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3) | ||
| 48 | #elif LCD_DEPTH <= 16 | 47 | #elif LCD_DEPTH <= 16 |
| 49 | #define BMP_BPP 16 | 48 | #define BMP_BPP 16 |
| 50 | #define BMP_LINESIZE ((LCD_WIDTH*2 + 3) & ~3) | ||
| 51 | #else | 49 | #else |
| 52 | #define BMP_BPP 24 | 50 | #define BMP_BPP 24 |
| 53 | #define BMP_LINESIZE ((LCD_WIDTH*3 + 3) & ~3) | 51 | #endif |
| 54 | #endif | 52 | #endif |
| 55 | 53 | ||
| 54 | #ifndef BMP_LINESIZE | ||
| 55 | #if LCD_DEPTH <= 4 | ||
| 56 | #define BMP_LINESIZE ((LCD_WIDTH/2 + 3) & ~3) | ||
| 57 | #elif LCD_DEPTH <= 8 | ||
| 58 | #define BMP_LINESIZE ((LCD_WIDTH + 3) & ~3) | ||
| 59 | #elif LCD_DEPTH <= 16 | ||
| 60 | #define BMP_LINESIZE ((LCD_WIDTH*2 + 3) & ~3) | ||
| 61 | #else | ||
| 62 | #define BMP_LINESIZE ((LCD_WIDTH*3 + 3) & ~3) | ||
| 63 | #endif | ||
| 64 | #endif | ||
| 56 | 65 | ||
| 57 | #ifdef BOOTLOADER | 66 | #ifdef BOOTLOADER |
| 58 | 67 | ||