summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-05-26 20:26:05 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-05-26 20:26:05 +0000
commit00d6cfd389ed5fcd4d0e32ff6fb23fbff01bf1ee (patch)
treec7f25fbd9c453a727f50a5357258abfc3041e151 /apps
parent92785b8f2f20b0fc16de7e771e5eb55fd8497ff8 (diff)
downloadrockbox-00d6cfd389ed5fcd4d0e32ff6fb23fbff01bf1ee.tar.gz
rockbox-00d6cfd389ed5fcd4d0e32ff6fb23fbff01bf1ee.tar.bz2
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
Diffstat (limited to 'apps')
-rw-r--r--apps/buffering.c4
-rw-r--r--apps/recorder/resize.c2
-rw-r--r--apps/recorder/resize.h2
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)
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 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,
#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 ef32066a0d..d71a3e7f1c 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(...)