len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix yellow when building with HAVE_ALBUMART, without HAVE_JPEG/HAVE_BMP_SCALING.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
apps/buffering.c
View file

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

2
apps/recorder/resize.c
View file

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

2
apps/recorder/resize.h
View file

@ -143,7 +143,7 @@ struct scaler_context {
bool (*h_scaler)(void*,struct scaler_context*, bool); 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__ #define IF_PIX_FMT(...) __VA_ARGS__
#else #else
#define IF_PIX_FMT(...) #define IF_PIX_FMT(...)