summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pennequin <nicolas.pennequin@free.fr>2007-11-11 13:15:36 +0000
committerNicolas Pennequin <nicolas.pennequin@free.fr>2007-11-11 13:15:36 +0000
commita384fb6d8a81f8056189f19b748d2fdf6702b066 (patch)
treeec926572b115aa427799654d0cb10358ab08093d
parente373ee859a1a17df95f035fef2bda84ec44555f1 (diff)
downloadrockbox-a384fb6d8a81f8056189f19b748d2fdf6702b066.tar.gz
rockbox-a384fb6d8a81f8056189f19b748d2fdf6702b066.zip
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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/buffering.c b/apps/buffering.c
index 3a412680ea..91b3995253 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -819,7 +819,7 @@ static bool fill_buffer(void)
819 } 819 }
820} 820}
821 821
822#ifdef HAVE_LCD_BITMAP 822#ifdef HAVE_ALBUMART
823/* Given a file descriptor to a bitmap file, write the bitmap data to the 823/* Given a file descriptor to a bitmap file, write the bitmap data to the
824 buffer, with a struct bitmap and the actual data immediately following. 824 buffer, with a struct bitmap and the actual data immediately following.
825 Return value is the total size (struct + data). */ 825 Return value is the total size (struct + data). */
@@ -829,7 +829,11 @@ static int load_bitmap(const int fd)
829 struct bitmap *bmp = (struct bitmap *)&buffer[buf_widx]; 829 struct bitmap *bmp = (struct bitmap *)&buffer[buf_widx];
830 /* FIXME: alignment may be needed for the data buffer. */ 830 /* FIXME: alignment may be needed for the data buffer. */
831 bmp->data = &buffer[buf_widx + sizeof(struct bitmap)]; 831 bmp->data = &buffer[buf_widx + sizeof(struct bitmap)];
832
833#if (LCD_DEPTH > 1) || defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)
832 bmp->maskdata = NULL; 834 bmp->maskdata = NULL;
835#endif
836
833 int free = (int)MIN(buffer_len - BUF_USED, buffer_len - buf_widx); 837 int free = (int)MIN(buffer_len - BUF_USED, buffer_len - buf_widx);
834 rc = read_bmp_fd(fd, bmp, free, FORMAT_ANY|FORMAT_DITHER); 838 rc = read_bmp_fd(fd, bmp, free, FORMAT_ANY|FORMAT_DITHER);
835 return rc + (rc > 0 ? sizeof(struct bitmap) : 0); 839 return rc + (rc > 0 ? sizeof(struct bitmap) : 0);