summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile25
-rw-r--r--source/cbz/mucbz.c19
2 files changed, 41 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 843de2c1..195a0f60 100644
--- a/Makefile
+++ b/Makefile
@@ -296,8 +296,29 @@ MUPDF_LIB = $(OUT)/libmupdf.a
THIRD_LIB = $(OUT)/libmupdfthird.a
THREAD_LIB = $(OUT)/libmuthreads.a
-MUPDF_OBJ := $(FITZ_OBJ) $(PDF_OBJ) $(CMAP_OBJ) $(FONT_OBJ) $(JAVASCRIPT_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
-THIRD_OBJ := $(FREETYPE_OBJ) $(HARFBUZZ_OBJ) $(JBIG2DEC_OBJ) $(LIBJPEG_OBJ) $(JPEGXR_OBJ) $(LURATECH_OBJ) $(MUJS_OBJ) $(OPENJPEG_OBJ) $(ZLIB_OBJ)
+MUPDF_OBJ := \
+ $(FITZ_OBJ) \
+ $(PDF_OBJ) \
+ $(CMAP_OBJ) \
+ $(FONT_OBJ) \
+ $(JAVASCRIPT_OBJ) \
+ $(XPS_OBJ) \
+ $(SVG_OBJ) \
+ $(CBZ_OBJ) \
+ $(HTML_OBJ) \
+ $(GPRF_OBJ)
+
+THIRD_OBJ := \
+ $(FREETYPE_OBJ) \
+ $(HARFBUZZ_OBJ) \
+ $(JBIG2DEC_OBJ) \
+ $(JPEGXR_OBJ) \
+ $(LIBJPEG_OBJ) \
+ $(LURATECH_OBJ) \
+ $(MUJS_OBJ) \
+ $(OPENJPEG_OBJ) \
+ $(ZLIB_OBJ)
+
THREAD_OBJ := $(THREAD_OBJ)
$(MUPDF_LIB) : $(MUPDF_OBJ)
diff --git a/source/cbz/mucbz.c b/source/cbz/mucbz.c
index 3a19c174..d5f62aa2 100644
--- a/source/cbz/mucbz.c
+++ b/source/cbz/mucbz.c
@@ -6,7 +6,24 @@ 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", ".wdp", ".hdp", ".jxr", ".pbm", ".pgm", ".ppm", ".pam", ".pnm",
+ ".bmp",
+ ".gif",
+ ".hdp",
+ ".j2k",
+ ".jp2",
+ ".jpeg",
+ ".jpg",
+ ".jpx",
+ ".jxr",
+ ".pam",
+ ".pbm",
+ ".pgm",
+ ".png",
+ ".pnm",
+ ".ppm",
+ ".tif",
+ ".tiff",
+ ".wdp",
NULL
};