From 20f76d61ae58bd47b647d79e40beebbbe747e480 Mon Sep 17 00:00:00 2001 From: Andrew Mahone Date: Mon, 4 May 2009 15:46:41 +0000 Subject: Make JPEG and BMP scaler optional with HAVE_JPEG and HAVE_BMP_SCALING, both defined for all targets that have HAVE_ALBUMART. Disable JPEG in PictureFlow and pluginlib album art search with 32KiB plugin buffer until PictureFlow gets overlay support. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20851 a1c6a512-1295-4272-9138-f99709370657 --- apps/buffering.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'apps/buffering.c') diff --git a/apps/buffering.c b/apps/buffering.c index 66bd22f12d..3bcd790c35 100644 --- a/apps/buffering.c +++ b/apps/buffering.c @@ -834,7 +834,6 @@ static bool fill_buffer(void) static int load_image(int fd, const char *path) { int rc; - int pathlen = strlen(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)]; @@ -848,10 +847,13 @@ static int load_image(int fd, const char *path) get_albumart_size(bmp); +#ifdef HAVE_JPEG + int pathlen = strlen(path); if (strcmp(path + pathlen - 4, ".bmp")) rc = read_jpeg_fd(fd, bmp, free, FORMAT_NATIVE|FORMAT_DITHER| FORMAT_RESIZE|FORMAT_KEEP_ASPECT, NULL); else +#endif rc = read_bmp_fd(fd, bmp, free, FORMAT_NATIVE|FORMAT_DITHER| FORMAT_RESIZE|FORMAT_KEEP_ASPECT, NULL); return rc + (rc > 0 ? sizeof(struct bitmap) : 0); -- cgit v1.2.3