diff options
Diffstat (limited to 'apps/buffering.c')
-rw-r--r-- | apps/buffering.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) | |||
834 | static int load_image(int fd, const char *path) | 834 | static int load_image(int fd, const char *path) |
835 | { | 835 | { |
836 | int rc; | 836 | int rc; |
837 | int pathlen = strlen(path); | ||
838 | struct bitmap *bmp = (struct bitmap *)&buffer[buf_widx]; | 837 | struct bitmap *bmp = (struct bitmap *)&buffer[buf_widx]; |
839 | /* FIXME: alignment may be needed for the data buffer. */ | 838 | /* FIXME: alignment may be needed for the data buffer. */ |
840 | bmp->data = &buffer[buf_widx + sizeof(struct bitmap)]; | 839 | bmp->data = &buffer[buf_widx + sizeof(struct bitmap)]; |
@@ -848,10 +847,13 @@ static int load_image(int fd, const char *path) | |||
848 | 847 | ||
849 | get_albumart_size(bmp); | 848 | get_albumart_size(bmp); |
850 | 849 | ||
850 | #ifdef HAVE_JPEG | ||
851 | int pathlen = strlen(path); | ||
851 | if (strcmp(path + pathlen - 4, ".bmp")) | 852 | if (strcmp(path + pathlen - 4, ".bmp")) |
852 | rc = read_jpeg_fd(fd, bmp, free, FORMAT_NATIVE|FORMAT_DITHER| | 853 | rc = read_jpeg_fd(fd, bmp, free, FORMAT_NATIVE|FORMAT_DITHER| |
853 | FORMAT_RESIZE|FORMAT_KEEP_ASPECT, NULL); | 854 | FORMAT_RESIZE|FORMAT_KEEP_ASPECT, NULL); |
854 | else | 855 | else |
856 | #endif | ||
855 | rc = read_bmp_fd(fd, bmp, free, FORMAT_NATIVE|FORMAT_DITHER| | 857 | rc = read_bmp_fd(fd, bmp, free, FORMAT_NATIVE|FORMAT_DITHER| |
856 | FORMAT_RESIZE|FORMAT_KEEP_ASPECT, NULL); | 858 | FORMAT_RESIZE|FORMAT_KEEP_ASPECT, NULL); |
857 | return rc + (rc > 0 ? sizeof(struct bitmap) : 0); | 859 | return rc + (rc > 0 ? sizeof(struct bitmap) : 0); |