From 037b9507fabfc69c015f2bdb19ba89b94925c86a Mon Sep 17 00:00:00 2001 From: unhelpful Date: Tue, 26 May 2009 20:26:05 +0000 Subject: [PATCH] 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 --- apps/buffering.c | 4 +++- apps/recorder/resize.c | 2 +- apps/recorder/resize.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/buffering.c b/apps/buffering.c index 4f2ec324d..afc444a45 100644 --- a/apps/buffering.c +++ b/apps/buffering.c @@ -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 diff --git a/apps/recorder/resize.c b/apps/recorder/resize.c index 3a0ad8d75..bae72c811 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, #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; diff --git a/apps/recorder/resize.h b/apps/recorder/resize.h index ef32066a0..d71a3e7f1 100644 --- a/apps/recorder/resize.h +++ b/apps/recorder/resize.h @@ -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(...) -- 2.11.4.GIT