diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2016-06-26 07:22:22 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2016-07-05 02:28:39 +0800 |
| commit | d42362b328019e106b1b6bfb267ada7844158b6e (patch) | |
| tree | ece9821083dc0c8c2c9e5c56a409ec16691dca6d /source/cbz | |
| parent | 653e62cf843fa04c9bc358130daab0285eb21fe6 (diff) | |
| download | mupdf-d42362b328019e106b1b6bfb267ada7844158b6e.tar.xz | |
Support J2K/JP2 files in CBZ.
Diffstat (limited to 'source/cbz')
| -rw-r--r-- | source/cbz/mucbz.c | 2 | ||||
| -rw-r--r-- | source/cbz/muimg.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c index 74b96268..0b7b4d10 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", + ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tif", ".tiff", ".jpx", ".jp2", ".j2k", NULL }; diff --git a/source/cbz/muimg.c b/source/cbz/muimg.c index d0087fa7..4e0f97df 100644 --- a/source/cbz/muimg.c +++ b/source/cbz/muimg.c @@ -159,7 +159,9 @@ 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, ".bmp")) + !fz_strcasecmp(ext, ".gif") || !fz_strcasecmp(ext, ".bmp") || + !fz_strcasecmp(ext, ".jpx") || !fz_strcasecmp(ext, ".jp2") || + !fz_strcasecmp(ext, ".j2k")) return 100; } if (!strcmp(magic, "png") || !strcmp(magic, "image/png") || @@ -167,7 +169,10 @@ img_recognize(fz_context *doc, const char *magic) !strcmp(magic, "jpeg") || !strcmp(magic, "image/pjpeg") || !strcmp(magic, "jpe") || !strcmp(magic, "jfif") || !strcmp(magic, "gif") || !strcmp(magic, "image/gif") || - !strcmp(magic, "bmp") || !strcmp(magic, "image/bmp")) + !strcmp(magic, "bmp") || !strcmp(magic, "image/bmp") || + !strcmp(magic, "jpx") || !strcmp(magic, "image/jpx") || + !strcmp(magic, "jp2") || !strcmp(magic, "image/jp2") || + !strcmp(magic, "j2k")) return 100; return 0; |