diff options
author | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-26 20:26:05 +0000 |
---|---|---|
committer | Andrew Mahone <andrew.mahone@gmail.com> | 2009-05-26 20:26:05 +0000 |
commit | 00d6cfd389ed5fcd4d0e32ff6fb23fbff01bf1ee (patch) | |
tree | c7f25fbd9c453a727f50a5357258abfc3041e151 | |
parent | 92785b8f2f20b0fc16de7e771e5eb55fd8497ff8 (diff) | |
download | rockbox-00d6cfd389ed5fcd4d0e32ff6fb23fbff01bf1ee.tar.gz rockbox-00d6cfd389ed5fcd4d0e32ff6fb23fbff01bf1ee.zip |
Fix yellow when building with HAVE_ALBUMART, without HAVE_JPEG/HAVE_BMP_SCALING.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21092 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/buffering.c | 4 | ||||
-rw-r--r-- | apps/recorder/resize.c | 2 | ||||
-rw-r--r-- | apps/recorder/resize.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 4f2ec324de..afc444a456 100644 --- a/apps/buffering.c +++ b/apps/buffering.c | |||
@@ -849,7 +849,9 @@ static int load_image(int fd, const char *path) | |||
849 | struct bitmap *bmp = (struct bitmap *)&buffer[buf_widx]; | 849 | struct bitmap *bmp = (struct bitmap *)&buffer[buf_widx]; |
850 | /* FIXME: alignment may be needed for the data buffer. */ | 850 | /* FIXME: alignment may be needed for the data buffer. */ |
851 | bmp->data = &buffer[buf_widx + sizeof(struct bitmap)]; | 851 | bmp->data = &buffer[buf_widx + sizeof(struct bitmap)]; |
852 | 852 | #ifndef HAVE_JPEG | |
853 | (void) path; | ||
854 | #endif | ||
853 | #if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1) | 855 | #if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1) |
854 | bmp->maskdata = NULL; | 856 | bmp->maskdata = NULL; |
855 | #endif | 857 | #endif |
diff --git a/apps/recorder/resize.c b/apps/recorder/resize.c index 3a0ad8d75b..bae72c8113 100644 --- a/apps/recorder/resize.c +++ b/apps/recorder/resize.c | |||
@@ -858,7 +858,7 @@ int resize_on_load(struct bitmap *bm, bool dither, struct dim *src, | |||
858 | #endif | 858 | #endif |
859 | if (format) | 859 | if (format) |
860 | #endif | 860 | #endif |
861 | #if defined(HAVE_LCD_COLOR) && (defined(HAVE_JPEG) || defined(PLUGIN)) | 861 | #ifdef HAVE_LCD_COLOR |
862 | ctx.output_row = format->output_row_32[format_index]; | 862 | ctx.output_row = format->output_row_32[format_index]; |
863 | #else | 863 | #else |
864 | ctx.output_row = format->output_row_32; | 864 | ctx.output_row = format->output_row_32; |
diff --git a/apps/recorder/resize.h b/apps/recorder/resize.h index ef32066a0d..d71a3e7f1c 100644 --- a/apps/recorder/resize.h +++ b/apps/recorder/resize.h | |||
@@ -143,7 +143,7 @@ struct scaler_context { | |||
143 | bool (*h_scaler)(void*,struct scaler_context*, bool); | 143 | bool (*h_scaler)(void*,struct scaler_context*, bool); |
144 | }; | 144 | }; |
145 | 145 | ||
146 | #if defined(HAVE_LCD_COLOR) && (defined(HAVE_JPEG) || defined(PLUGIN)) | 146 | #if defined(HAVE_LCD_COLOR) |
147 | #define IF_PIX_FMT(...) __VA_ARGS__ | 147 | #define IF_PIX_FMT(...) __VA_ARGS__ |
148 | #else | 148 | #else |
149 | #define IF_PIX_FMT(...) | 149 | #define IF_PIX_FMT(...) |