diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-07-29 12:37:48 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-07-29 12:37:48 +0000 |
commit | 2d31d77a8ba231cb03ec35863c4c4ce2024f6509 (patch) | |
tree | b85ca1bede3e83695619064ee9a323f0a8da1865 /apps/gui/skin_engine/skin_backdrops.c | |
parent | e436483b66a931fef6436e9cd3e69eb2b3ff1f7b (diff) | |
download | rockbox-2d31d77a8ba231cb03ec35863c4c4ce2024f6509.tar.gz rockbox-2d31d77a8ba231cb03ec35863c4c4ce2024f6509.zip |
FS#11470 - new skin code, finally svn uses the new parser from the theme editor. This means that a skin that passes the editor WILL pass svn and checkwps (unless the target runs out of skin buffer or something.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27613 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine/skin_backdrops.c')
-rw-r--r-- | apps/gui/skin_engine/skin_backdrops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c index a32bfbe589..4288e0a7b4 100644 --- a/apps/gui/skin_engine/skin_backdrops.c +++ b/apps/gui/skin_engine/skin_backdrops.c | |||
@@ -24,9 +24,9 @@ | |||
24 | #include <stdlib.h> | 24 | #include <stdlib.h> |
25 | #include "string-extra.h" | 25 | #include "string-extra.h" |
26 | #include "settings.h" | 26 | #include "settings.h" |
27 | #include "skin_buffer.h" | ||
28 | #include "wps_internals.h" | 27 | #include "wps_internals.h" |
29 | #include "skin_engine.h" | 28 | #include "skin_engine.h" |
29 | #include "skin_buffer.h" | ||
30 | 30 | ||
31 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) | 31 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) |
32 | 32 | ||
@@ -100,7 +100,7 @@ char* skin_backdrop_load(char* backdrop, char *bmpdir, enum screen_type screen) | |||
100 | if (!bdrop) | 100 | if (!bdrop) |
101 | return NULL; /* too many backdrops loaded */ | 101 | return NULL; /* too many backdrops loaded */ |
102 | 102 | ||
103 | bdrop->buffer = skin_buffer_alloc(buf_size); | 103 | bdrop->buffer = (char*)skin_buffer_alloc(buf_size); |
104 | if (!bdrop->buffer) | 104 | if (!bdrop->buffer) |
105 | return NULL; | 105 | return NULL; |
106 | loaded = screens[screen].backdrop_load(filename, bdrop->buffer); | 106 | loaded = screens[screen].backdrop_load(filename, bdrop->buffer); |