From 2646c6ba1d2c3dbca2495b9d7f14bf9b502d1753 Mon Sep 17 00:00:00 2001 From: jdgordon Date: Fri, 29 Jan 2010 08:25:24 +0000 Subject: [PATCH] fix the last of the red... note to self, fix backdrop.h! git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24368 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/backdrop.h | 10 +++++++--- apps/gui/skin_engine/skin_buffer.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/gui/backdrop.h b/apps/gui/backdrop.h index 22cdceb28e..2ab379e1cd 100644 --- a/apps/gui/backdrop.h +++ b/apps/gui/backdrop.h @@ -35,13 +35,17 @@ void backdrop_show(char* backdrop_buffer); #define LCD_BACKDROP_BYTES 0 #endif -#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 && !defined(__PCTOOL__) -#define REMOTE_LCD_BACKDROP_BYTES \ - (LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data)) +#if defined(HAVE_REMOTE_LCD) bool remote_backdrop_load(const char *filename, char* backdrop_buffer); void remote_backdrop_show(char* backdrop_buffer); + +#if LCD_DEPTH > 1 && LCD_REMOTE_DEPTH > 1 && !defined(__PCTOOL__) +#define REMOTE_LCD_BACKDROP_BYTES \ + (LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data)) #else #define REMOTE_LCD_BACKDROP_BYTES 0 #endif +#endif + #endif /* _BACKDROP_H */ diff --git a/apps/gui/skin_engine/skin_buffer.c b/apps/gui/skin_engine/skin_buffer.c index a15ad10bee..3418b074a4 100644 --- a/apps/gui/skin_engine/skin_buffer.c +++ b/apps/gui/skin_engine/skin_buffer.c @@ -55,7 +55,7 @@ #ifdef HAVE_LCD_BITMAP -#define MAIN_BUFFER ((2*LCD_HEIGHT*LCD_WIDTH*LCD_DEPTH/8) \ +#define MAIN_BUFFER ((1*LCD_HEIGHT*LCD_WIDTH*LCD_DEPTH/8) \ + (SKINNABLE_SCREENS_COUNT * LCD_BACKDROP_BYTES)) #if (NB_SCREENS > 1) -- 2.11.4.GIT