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
This commit is contained in:
Andrew Mahone 2009-05-26 20:26:05 +00:00
parent 92785b8f2f
commit 00d6cfd389
3 changed files with 5 additions and 3 deletions

View file

@ -849,7 +849,9 @@ static int load_image(int fd, const char *path)
struct bitmap *bmp = (struct bitmap *)&buffer[buf_widx];
/* FIXME: alignment may be needed for the data buffer. */
bmp->data = &buffer[buf_widx + sizeof(struct bitmap)];
#ifndef HAVE_JPEG
(void) path;
#endif
#if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)
bmp->maskdata = NULL;
#endif

View file

@ -858,7 +858,7 @@ int resize_on_load(struct bitmap *bm, bool dither, struct dim *src,
#endif
if (format)
#endif
#if defined(HAVE_LCD_COLOR) && (defined(HAVE_JPEG) || defined(PLUGIN))
#ifdef HAVE_LCD_COLOR
ctx.output_row = format->output_row_32[format_index];
#else
ctx.output_row = format->output_row_32;

View file

@ -143,7 +143,7 @@ struct scaler_context {
bool (*h_scaler)(void*,struct scaler_context*, bool);
};
#if defined(HAVE_LCD_COLOR) && (defined(HAVE_JPEG) || defined(PLUGIN))
#if defined(HAVE_LCD_COLOR)
#define IF_PIX_FMT(...) __VA_ARGS__
#else
#define IF_PIX_FMT(...)