diff options
author | Sebastian Rasmussen <sebras@gmail.com> | 2015-09-07 01:47:08 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2016-03-23 15:58:47 +0100 |
commit | 805c6109967059ee2dc9574923ceb9e89cae57ef (patch) | |
tree | 4283be9feefbc892dedd74d2ef74214771a6a6e3 /source/cbz | |
parent | f457923b92ad0a6d9fe736bf8021c652bc654d72 (diff) | |
download | mupdf-805c6109967059ee2dc9574923ceb9e89cae57ef.tar.xz |
Add support for BMP images.
Diffstat (limited to 'source/cbz')
-rw-r--r-- | source/cbz/mucbz.c | 4 | ||||
-rw-r--r-- | source/cbz/muimg.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c index 06873f8c..af955a27 100644 --- a/source/cbz/mucbz.c +++ b/source/cbz/mucbz.c @@ -6,8 +6,8 @@ typedef struct cbz_document_s cbz_document; typedef struct cbz_page_s cbz_page; static const char *cbz_ext_list[] = { - ".jpg", ".jpeg", ".png", ".gif", - ".JPG", ".JPEG", ".PNG", ".GIF", + ".jpg", ".jpeg", ".png", ".gif", ".bmp", + ".JPG", ".JPEG", ".PNG", ".GIF", ".BMP", NULL }; diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c index 204d066b..f200480e 100644 --- a/source/cbz/muimg.c +++ b/source/cbz/muimg.c @@ -159,14 +159,15 @@ img_recognize(fz_context *doc, const char *magic) if (!fz_strcasecmp(ext, ".png") || !fz_strcasecmp(ext, ".jpg") || !fz_strcasecmp(ext, ".jpeg") || !fz_strcasecmp(ext, ".jfif") || !fz_strcasecmp(ext, ".jfif-tbnl") || !fz_strcasecmp(ext, ".jpe") || - !fz_strcasecmp(ext, ".gif")) + !fz_strcasecmp(ext, ".gif") || !fz_strcasecmp(ext, ".bmp")) return 100; } if (!strcmp(magic, "png") || !strcmp(magic, "image/png") || !strcmp(magic, "jpg") || !strcmp(magic, "image/jpeg") || !strcmp(magic, "jpeg") || !strcmp(magic, "image/pjpeg") || !strcmp(magic, "jpe") || !strcmp(magic, "jfif") || - !strcmp(magic, "gif") || !strcmp(magic, "image/gif")) + !strcmp(magic, "gif") || !strcmp(magic, "image/gif") || + !strcmp(magic, "bmp") || !strcmp(magic, "image/bmp")) return 100; return 0; |