diff options
| author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-11-11 13:15:36 +0000 |
|---|---|---|
| committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-11-11 13:15:36 +0000 |
| commit | a384fb6d8a81f8056189f19b748d2fdf6702b066 (patch) | |
| tree | ec926572b115aa427799654d0cb10358ab08093d | |
| parent | e373ee859a1a17df95f035fef2bda84ec44555f1 (diff) | |
| download | rockbox-a384fb6d8a81f8056189f19b748d2fdf6702b066.zip rockbox-a384fb6d8a81f8056189f19b748d2fdf6702b066.tar.gz rockbox-a384fb6d8a81f8056189f19b748d2fdf6702b066.tar.bz2 rockbox-a384fb6d8a81f8056189f19b748d2fdf6702b066.tar.xz | |
Fix red on the iFP.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15575 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/buffering.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 3a41268..91b3995 100644 --- a/apps/buffering.c +++ b/apps/buffering.c @@ -819,7 +819,7 @@ static bool fill_buffer(void) } } -#ifdef HAVE_LCD_BITMAP +#ifdef HAVE_ALBUMART /* Given a file descriptor to a bitmap file, write the bitmap data to the buffer, with a struct bitmap and the actual data immediately following. Return value is the total size (struct + data). */ @@ -829,7 +829,11 @@ static int load_bitmap(const int fd) 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)]; + +#if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1) bmp->maskdata = NULL; +#endif + int free = (int)MIN(buffer_len - BUF_USED, buffer_len - buf_widx); rc = read_bmp_fd(fd, bmp, free, FORMAT_ANY|FORMAT_DITHER); return rc + (rc > 0 ? sizeof(struct bitmap) : 0); |