diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2015-08-24 20:46:52 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-07-06 13:34:37 +0200 |
| commit | 40dc2fabdd3bd647c21ee4334bb81f96a2103ff5 (patch) | |
| tree | 3f0812969ba5ba2a02d06becbb294fe65174e488 /source/cbz | |
| parent | 41014a238806e5b18ffa3a62667e9950b7f1b4d0 (diff) | |
| download | mupdf-40dc2fabdd3bd647c21ee4334bb81f96a2103ff5.tar.xz | |
Add optional support for JPEG-XR.
Diffstat (limited to 'source/cbz')
| -rw-r--r-- | source/cbz/mucbz.c | 2 | ||||
| -rw-r--r-- | source/cbz/muimg.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c index 0b7b4d10..f9c73d6b 100644 --- a/source/cbz/mucbz.c +++ b/source/cbz/mucbz.c @@ -6,7 +6,7 @@ typedef struct cbz_document_s cbz_document; typedef struct cbz_page_s cbz_page; static const char *cbz_ext_list[] = { - ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tif", ".tiff", ".jpx", ".jp2", ".j2k", + ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tif", ".tiff", ".jpx", ".jp2", ".j2k", ".wdp", ".hdp", ".jxr", NULL }; diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c index 4e0f97df..91b89dfa 100644 --- a/source/cbz/muimg.c +++ b/source/cbz/muimg.c @@ -161,7 +161,8 @@ img_recognize(fz_context *doc, const char *magic) !fz_strcasecmp(ext, ".jfif-tbnl") || !fz_strcasecmp(ext, ".jpe") || !fz_strcasecmp(ext, ".gif") || !fz_strcasecmp(ext, ".bmp") || !fz_strcasecmp(ext, ".jpx") || !fz_strcasecmp(ext, ".jp2") || - !fz_strcasecmp(ext, ".j2k")) + !fz_strcasecmp(ext, ".j2k") || !fz_strcasecmp(ext, ".wdp") || + !fz_strcasecmp(ext, ".hdp") || !fz_strcasecmp(ext, ".jxr")) return 100; } if (!strcmp(magic, "png") || !strcmp(magic, "image/png") || @@ -172,7 +173,9 @@ img_recognize(fz_context *doc, const char *magic) !strcmp(magic, "bmp") || !strcmp(magic, "image/bmp") || !strcmp(magic, "jpx") || !strcmp(magic, "image/jpx") || !strcmp(magic, "jp2") || !strcmp(magic, "image/jp2") || - !strcmp(magic, "j2k")) + !strcmp(magic, "j2k") || !strcmp(magic, "wdp") || + !strcmp(magic, "hdp") || !strcmp(magic, "image/vnd.ms-photo") || + !strcmp(magic, "jxr") || !strcmp(magic, "image/jxr")) return 100; return 0; |