From 643370f04348569b5e5e577660031d638537671c Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Wed, 19 Jun 2013 17:09:53 +0200 Subject: Update source, makefiles and win32 projects. --- Makefile | 230 +++++---- Makethird | 6 +- include/mupdf/image.h | 51 -- include/mupdf/img.h | 51 ++ platform/win32/generate.bat | 38 +- platform/win32/generated.vcproj | 726 +------------------------- platform/win32/libmupdf-js-none.vcproj | 340 ++++++++++++ platform/win32/libmupdf-js-v8.vcproj | 352 +++++++++++++ platform/win32/libmupdf-nov8.vcproj | 220 -------- platform/win32/libmupdf-v8.vcproj | 232 --------- platform/win32/libmupdf.vcproj | 907 ++++++++++++++++++--------------- platform/win32/libthirdparty.vcproj | 432 ++++++++-------- platform/win32/mudraw.vcproj | 8 +- platform/win32/mujstest-v8.vcproj | 46 +- platform/win32/mupdf-v8.vcproj | 48 +- platform/win32/mupdf.sln | 28 +- platform/win32/mupdf.vcproj | 42 +- platform/win32/mutool.vcproj | 18 +- scripts/cmapdump.c | 22 +- source/img/muimage.c | 2 +- 20 files changed, 1707 insertions(+), 2092 deletions(-) delete mode 100644 include/mupdf/image.h create mode 100644 include/mupdf/img.h create mode 100644 platform/win32/libmupdf-js-none.vcproj create mode 100644 platform/win32/libmupdf-js-v8.vcproj delete mode 100644 platform/win32/libmupdf-nov8.vcproj delete mode 100644 platform/win32/libmupdf-v8.vcproj diff --git a/Makefile b/Makefile index 28046177..3e02db1d 100644 --- a/Makefile +++ b/Makefile @@ -5,14 +5,14 @@ build ?= debug OUT := build/$(build) GEN := generated -# --- Variables, Commands, etc... --- - default: all +# --- Configuration --- + # Do not specify CFLAGS or LIBS on the make invocation line - specify # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that # set a variable that was set on the command line. -CFLAGS += $(XCFLAGS) -Iinclude -Iscripts -I$(GEN) -Iucdn +CFLAGS += $(XCFLAGS) -Iinclude -Iscripts -I$(GEN) LIBS += $(XLIBS) -lm include Makerules @@ -39,6 +39,8 @@ CFLAGS += $(OPENJPEG_CFLAGS) CFLAGS += $(OPENSSL_CFLAGS) CFLAGS += $(ZLIB_CFLAGS) +# --- Commands --- + ifeq "$(verbose)" "" QUIET_AR = @ echo ' ' ' ' AR $@ ; QUIET_CC = @ echo ' ' ' ' CC $@ ; @@ -56,15 +58,70 @@ LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ RM_CMD = $(QUIET_RM) rm -f $@ -# --- Rules --- +# --- File lists --- + +ALL_DIR := $(OUT)/fitz +ALL_DIR += $(OUT)/pdf $(OUT)/pdf/js +ALL_DIR += $(OUT)/xps +ALL_DIR += $(OUT)/cbz +ALL_DIR += $(OUT)/img +ALL_DIR += $(OUT)/tools +ALL_DIR += $(OUT)/platform/x11 FITZ_HDR := include/mupdf/fitz.h $(wildcard include/mupdf/fitz/*.h) PDF_HDR := include/mupdf/pdf.h $(wildcard include/mupdf/pdf/*.h) XPS_HDR := include/mupdf/xps.h CBZ_HDR := include/mupdf/cbz.h -IMG_HDR := include/mupdf/image.h +IMG_HDR := include/mupdf/img.h + +FITZ_SRC := $(wildcard source/fitz/*.c) +PDF_SRC := $(wildcard source/pdf/*.c) +XPS_SRC := $(wildcard source/xps/*.c) +CBZ_SRC := $(wildcard source/cbz/*.c) +IMG_SRC := $(wildcard source/img/*.c) + +FITZ_SRC_HDR := $(wildcard source/fitz/*.h) +PDF_SRC_HDR := $(wildcard source/pdf/*.h) +XPS_SRC_HDR := $(wildcard source/xps/*.h) +CBZ_SRC_HDR := $(wildcard source/cbz/*.h) +IMG_SRC_HDR := $(wildcard source/img/*.h) + +FITZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(FITZ_SRC)))) +PDF_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(PDF_SRC)))) +XPS_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(XPS_SRC)))) +CBZ_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(CBZ_SRC)))) +IMG_OBJ := $(subst source/, $(OUT)/, $(addsuffix .o, $(basename $(IMG_SRC)))) + +PDF_JS_V8_OBJ := $(OUT)/pdf/js/pdf-js.o $(OUT)/pdf/js/pdf-jsimp-cpp.o $(OUT)/pdf/js/pdf-jsimp-v8.o +PDF_JS_NONE_OBJ := $(OUT)/pdf/js/pdf-js-none.o + +$(FITZ_OBJ) : $(FITZ_HDR) $(FITZ_SRC_HDR) +$(PDF_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR) +$(XPS_OBJ) : $(FITZ_HDR) $(XPS_HDR) $(XPS_SRC_HDR) +$(CBZ_OBJ) : $(FITZ_HDR) $(CBZ_HDR) $(CBZ_SRC_HDR) +$(IMG_OBJ) : $(FITZ_HDR) $(IMG_HDR) $(IMG_SRC_HDR) + +$(PDF_JS_V8_OBJ) : $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR) +$(PDF_JS_NONE_OBJ) := $(FITZ_HDR) $(PDF_HDR) $(PDF_SRC_HDR) + +# --- Library --- + +MUPDF_LIB := $(OUT)/libmupdf.a +MUPDF_JS_NONE_LIB := $(OUT)/libmupdf-js-none.a -$(OUT) $(GEN) : +$(MUPDF_LIB) : $(FITZ_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(CBZ_OBJ) $(IMG_OBJ) +$(MUPDF_JS_NONE_LIB) : $(PDF_JS_NONE_OBJ) + +ifeq "$(V8_PRESENT)" "yes" +MUPDF_JS_V8_LIB := $(OUT)/libmupdf-js-v8.a +$(MUPDF_JS_V8_LIB) : $(PDF_JS_V8_OBJ) +endif + +INSTALL_LIBS := $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(MUPDF_JS_V8_LIB) + +# --- Rules --- + +$(ALL_DIR) $(OUT) $(GEN) : $(MKDIR_CMD) $(OUT)/%.a : @@ -72,68 +129,23 @@ $(OUT)/%.a : $(AR_CMD) $(RANLIB_CMD) -$(OUT)/% : $(OUT)/%.o +$(OUT)/%: $(OUT)/%.o $(LINK_CMD) -$(OUT)/%.o : fitz/%.c $(FITZ_HDR) $(wildcard fitz/*.h) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : draw/%.c $(FITZ_HDR) $(wildcard draw/*.h) | $(OUT) +$(OUT)/%.o : source/%.c | $(ALL_DIR) $(CC_CMD) -$(OUT)/%.o : pdf/%.c $(FITZ_HDR) $(PDF_HDR) $(wildcard pdf/*.h) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : pdf/%.cpp $(FITZ_HDR) $(PDF_HDR) $(wildcard pdf/*.h) | $(OUT) + +$(OUT)/%.o : source/%.cpp | $(ALL_DIR) $(CXX_CMD) -$(OUT)/%.o : xps/%.c $(FITZ_HDR) $(XPS_HDR) $(wildcard xps/*.h) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : cbz/%.c $(FITZ_HDR) $(CBZ_HDR) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : image/%.c $(FITZ_HDR) $(IMG_HDR) | $(OUT) - $(CC_CMD) -$(OUT)/%.o : ucdn/%.c | $(OUT) - $(CC_CMD) + $(OUT)/%.o : scripts/%.c | $(OUT) $(CC_CMD) -$(OUT)/x11_%.o : apps/x11_%.c $(FITZ_HDR) | $(OUT) +$(OUT)/platform/x11/%.o : platform/x11/%.c | $(ALL_DIR) $(CC_CMD) $(X11_CFLAGS) -$(OUT)/%.o : apps/%.c $(FITZ_HDR) $(PDF_HDR) | $(OUT) - $(CC_CMD) - - .PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules -# --- Fitz, MuPDF, MuXPS and MuCBZ library --- - -MUPDF_LIB := $(OUT)/libmupdf.a -MUPDF_V8_LIB := $(OUT)/libmupdf-v8.a - -FITZ_SRC := $(notdir $(wildcard fitz/*.c draw/*.c ucdn/*.c)) -FITZ_SRC := $(filter-out draw_simple_scale.c, $(FITZ_SRC)) -PDF_ALL_SRC := $(notdir $(wildcard pdf/*.c)) -PDF_SRC := $(filter-out pdf_js.c pdf_jsimp_cpp.c, $(PDF_ALL_SRC)) -PDF_V8_SRC := $(filter-out pdf_js_none.c, $(PDF_ALL_SRC)) -PDF_V8_CPP_SRC := $(notdir $(wildcard pdf/*.cpp)) -XPS_SRC := $(notdir $(wildcard xps/*.c)) -CBZ_SRC := $(notdir $(wildcard cbz/*.c)) -IMG_SRC := $(notdir $(wildcard image/*.c)) - -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(PDF_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(XPS_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(CBZ_SRC:%.c=%.o)) -$(MUPDF_LIB) : $(addprefix $(OUT)/, $(IMG_SRC:%.c=%.o)) - -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(FITZ_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(PDF_V8_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(PDF_V8_CPP_SRC:%.cpp=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(XPS_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(CBZ_SRC:%.c=%.o)) -$(MUPDF_V8_LIB) : $(addprefix $(OUT)/, $(IMG_SRC:%.c=%.o)) - -libs: $(MUPDF_LIB) $(THIRD_LIBS) -libs_v8: libs $(MUPDF_V8_LIB) - # --- Generated CMAP, FONT and JAVASCRIPT files --- CMAPDUMP := $(OUT)/cmapdump @@ -141,14 +153,15 @@ FONTDUMP := $(OUT)/fontdump CQUOTE := $(OUT)/cquote BIN2HEX := $(OUT)/bin2hex -CMAP_CNS_SRC := $(wildcard cmaps/cns/*) -CMAP_GB_SRC := $(wildcard cmaps/gb/*) -CMAP_JAPAN_SRC := $(wildcard cmaps/japan/*) -CMAP_KOREA_SRC := $(wildcard cmaps/korea/*) -FONT_BASE14_SRC := $(wildcard fonts/*.cff) -FONT_DROID_SRC := fonts/droid/DroidSans.ttf fonts/droid/DroidSansMono.ttf -FONT_CJK_SRC := fonts/droid/DroidSansFallback.ttf -FONT_CJK_FULL_SRC := fonts/droid/DroidSansFallbackFull.ttf +CMAP_CNS_SRC := $(wildcard resources/cmaps/cns/*) +CMAP_GB_SRC := $(wildcard resources/cmaps/gb/*) +CMAP_JAPAN_SRC := $(wildcard resources/cmaps/japan/*) +CMAP_KOREA_SRC := $(wildcard resources/cmaps/korea/*) + +FONT_BASE14_SRC := $(wildcard resources/fonts/*.cff) +FONT_DROID_SRC := resources/fonts/droid/DroidSans.ttf resources/fonts/droid/DroidSansMono.ttf +FONT_CJK_SRC := resources/fonts/droid/DroidSansFallback.ttf +FONT_CJK_FULL_SRC := resources/fonts/droid/DroidSansFallbackFull.ttf $(GEN)/gen_cmap_cns.h : $(CMAP_CNS_SRC) $(QUIET_GEN) $(CMAPDUMP) $@ $(CMAP_CNS_SRC) @@ -172,12 +185,12 @@ $(GEN)/gen_font_cjk_full.h : $(FONT_CJK_FULL_SRC) FONT_GEN := $(GEN)/gen_font_base14.h $(GEN)/gen_font_droid.h $(GEN)/gen_font_cjk.h $(GEN)/gen_font_cjk_full.h -JAVASCRIPT_SRC := pdf/pdf_util.js +JAVASCRIPT_SRC := source/pdf/js/pdf-util.js JAVASCRIPT_GEN := $(GEN)/gen_js_util.h $(JAVASCRIPT_GEN) : $(JAVASCRIPT_SRC) $(QUIET_GEN) $(CQUOTE) $@ $(JAVASCRIPT_SRC) -ADOBECA_SRC := certs/AdobeCA.p7c +ADOBECA_SRC := resources/certs/AdobeCA.p7c ADOBECA_GEN := $(GEN)/gen_adobe_ca.h $(ADOBECA_GEN) : $(ADOBECA_SRC) $(QUIET_GEN) $(BIN2HEX) $@ $(ADOBECA_SRC) @@ -191,50 +204,55 @@ endif generate: $(CMAP_GEN) $(FONT_GEN) $(JAVASCRIPT_GEN) $(ADOBECA_GEN) -$(OUT)/pdf_cmap_table.o : $(CMAP_GEN) -$(OUT)/pdf_fontfile.o : $(FONT_GEN) -$(OUT)/pdf_js.o : $(JAVASCRIPT_GEN) -$(OUT)/crypt_pkcs7.o : $(ADOBECA_GEN) -$(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c +$(OUT)/pdf/pdf-cmap-table.o : $(CMAP_GEN) +$(OUT)/pdf/pdf-fontfile.o : $(FONT_GEN) +$(OUT)/pdf/pdf-pkcs7.o : $(ADOBECA_GEN) +$(OUT)/pdf/js/pdf-js.o : $(JAVASCRIPT_GEN) +$(OUT)/cmapdump.o : source/pdf/pdf-cmap.c source/pdf/pdf-cmap-parse.c # --- Tools and Apps --- MUDRAW := $(addprefix $(OUT)/, mudraw) -$(MUDRAW) : $(MUPDF_LIB) $(THIRD_LIBS) +$(MUDRAW) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) +$(MUDRAW) : $(addprefix $(OUT)/tools/, mudraw.o) + $(LINK_CMD) MUTOOL := $(addprefix $(OUT)/, mutool) -$(MUTOOL) : $(addprefix $(OUT)/, pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o) $(MUPDF_LIB) $(THIRD_LIBS) +$(MUTOOL) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) +$(MUTOOL) : $(addprefix $(OUT)/tools/, mutool.o pdfclean.o pdfextract.o pdfinfo.o pdfposter.o pdfshow.o) + $(LINK_CMD) -ifeq "$(NOX11)" "" +ifeq "$(V8_PRESENT)" "yes" +MUJSTEST_V8 := $(OUT)/mujstest-v8 +$(MUJSTEST_V8) : $(MUPDF_LIB) $(MUPDF_JS_V8_LIB) $(THIRD_LIBS) +$(MUJSTEST_V8) : $(addprefix $(OUT)/platform/x11/, jstest_main.o pdfapp.o) + $(LINK_CMD) $(V8_LIBS) +endif +ifeq "$(NOX11)" "" MUVIEW := $(OUT)/mupdf -$(MUVIEW) : $(MUPDF_LIB) $(THIRD_LIBS) -$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) +$(MUVIEW) : $(MUPDF_LIB) $(MUPDF_JS_NONE_LIB) $(THIRD_LIBS) +$(MUVIEW) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) $(LINK_CMD) $(X11_LIBS) +endif +ifeq "$(V8_PRESENT)" "yes" +ifeq "$(NOX11)" "" MUVIEW_V8 := $(OUT)/mupdf-v8 -$(MUVIEW_V8) : $(MUPDF_V8_LIB) $(THIRD_LIBS) -$(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o) +$(MUVIEW_V8) : $(MUPDF_LIB) $(MUPDF_JS_V8_LIB) $(THIRD_LIBS) +$(MUVIEW_V8) : $(addprefix $(OUT)/platform/x11/, x11_main.o x11_image.o pdfapp.o) $(LINK_CMD) $(X11_LIBS) $(V8_LIBS) endif - -MUJSTEST_V8 := $(OUT)/mujstest-v8 -$(MUJSTEST_V8) : $(MUPDF_V8_LIB) $(THIRD_LIBS) -$(MUJSTEST_V8) : $(addprefix $(OUT)/, jstest_main.o pdfapp.o) - $(LINK_CMD) $(V8_LIBS) - -ifeq "$(V8_PRESENT)" "1" -JSTARGETS := $(MUJSTEST_V8) $(MUPDF_V8_LIB) $(MUVIEW_V8) -else -JSTARGETS := endif +INSTALL_APPS := $(MUDRAW) $(MUTOOL) $(MUVIEW) $(MUJSTEST_V8) $(MUVIEW_V8) + # --- Format man pages --- %.txt: %.1 nroff -man $< | col -b | expand > $@ -MAN_FILES := $(wildcard apps/man/*.1) +MAN_FILES := $(wildcard docs/man/*.1) TXT_FILES := $(MAN_FILES:%.1=%.txt) catman: $(TXT_FILES) @@ -247,27 +265,39 @@ libdir ?= $(prefix)/lib incdir ?= $(prefix)/include mandir ?= $(prefix)/share/man -install: $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(incdir) $(DESTDIR)$(mandir)/man1 - install $(MUPDF_LIB) $(DESTDIR)$(libdir) - install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h image/muimage.h $(DESTDIR)$(incdir) - install $(MUVIEW) $(MUDRAW) $(MUTOOL) $(DESTDIR)$(bindir) - install $(wildcard apps/man/*.1) $(DESTDIR)$(mandir)/man1 +third: $(THIRD_LIBS) +libs: $(INSTALL_LIBS) +apps: $(INSTALL_APPS) + +install: libs apps + install -d $(DESTDIR)$(incdir)/mupdf + install -d $(DESTDIR)$(incdir)/mupdf/fitz + install -d $(DESTDIR)$(incdir)/mupdf/pdf + install include/mupdf/*.h $(DESTDIR)$(incdir)/mupdf + install include/mupdf/fitz/*.h $(DESTDIR)$(incdir)/mupdf/fitz + install include/mupdf/pdf/*.h $(DESTDIR)$(incdir)/mupdf/pdf + + install -d $(DESTDIR)$(libdir) + install $(INSTALL_LIBS) $(DESTDIR)$(libdir) + + install -d $(DESTDIR)$(bindir) + install $(INSTALL_APPS) $(DESTDIR)$(bindir) + + install -d $(DESTDIR)$(mandir)/man1 + install docs/man/*.1 $(DESTDIR)$(mandir)/man1 # --- Clean and Default --- -tags: $(wildcard */*.h */*.c) +tags: $(shell find include source -name '*.[ch]') ctags $^ all: all-nojs $(JSTARGETS) all-nojs: $(THIRD_LIBS) $(MUPDF_LIB) $(MUVIEW) $(MUDRAW) $(MUTOOL) -third: $(THIRD_LIBS) - clean: rm -rf $(OUT) nuke: rm -rf build/* $(GEN) -.PHONY: all clean nuke install +.PHONY: all clean nuke install third libs apps generate diff --git a/Makethird b/Makethird index 99ecdc32..8ae8e625 100644 --- a/Makethird +++ b/Makethird @@ -37,12 +37,12 @@ V8_ARCH ?= x64 ifeq "$(OS)" "Darwin" V8_LIBS = -L$(V8_DIR)/out-mac/$(V8_ARCH).$(V8_LIB_CHOICE)/ -lv8_base -lv8_snapshot -lstdc++ else -V8_LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8_LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread -lstdc++ +V8_LIBS = -L$(V8_DIR)/out/$(V8_ARCH).$(V8_LIB_CHOICE)/obj.target/tools/gyp -lv8_base -lv8_snapshot -lpthread -ldl -lstdc++ endif -V8_PRESENT := 1 +V8_PRESENT := yes else -V8_PRESENT := 0 +V8_PRESENT := no endif # --- FreeType 2 --- diff --git a/include/mupdf/image.h b/include/mupdf/image.h deleted file mode 100644 index 4c10b0d3..00000000 --- a/include/mupdf/image.h +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef MUIMAGE_H -#define MUIMAGE_H - -#include "mupdf/fitz.h" - -typedef struct image_document_s image_document; -typedef struct image_page_s image_page; - -/* - image_open_document: Open a document. - - Open a document for reading so the library is able to locate - objects and pages inside the file. - - The returned image_document should be used when calling most - other functions. Note that it wraps the context, so those - functions implicitly get access to the global state in - context. - - filename: a path to a file as it would be given to open(2). -*/ -image_document *image_open_document(fz_context *ctx, const char *filename); - -/* - image_open_document_with_stream: Opens a document. - - Same as image_open_document, but takes a stream instead of a - filename to locate the document to open. Increments the - reference count of the stream. See fz_open_file, - fz_open_file_w or fz_open_fd for opening a stream, and - fz_close for closing an open stream. -*/ -image_document *image_open_document_with_stream(fz_context *ctx, fz_stream *file); - -/* - image_close_document: Closes and frees an opened document. - - The resource store in the context associated with image_document - is emptied. - - Does not throw exceptions. -*/ -void image_close_document(image_document *doc); - -int image_count_pages(image_document *doc); -image_page *image_load_page(image_document *doc, int number); -fz_rect *image_bound_page(image_document *doc, image_page *page, fz_rect *rect); -void image_free_page(image_document *doc, image_page *page); -void image_run_page(image_document *doc, image_page *page, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie); - -#endif diff --git a/include/mupdf/img.h b/include/mupdf/img.h new file mode 100644 index 00000000..4c10b0d3 --- /dev/null +++ b/include/mupdf/img.h @@ -0,0 +1,51 @@ +#ifndef MUIMAGE_H +#define MUIMAGE_H + +#include "mupdf/fitz.h" + +typedef struct image_document_s image_document; +typedef struct image_page_s image_page; + +/* + image_open_document: Open a document. + + Open a document for reading so the library is able to locate + objects and pages inside the file. + + The returned image_document should be used when calling most + other functions. Note that it wraps the context, so those + functions implicitly get access to the global state in + context. + + filename: a path to a file as it would be given to open(2). +*/ +image_document *image_open_document(fz_context *ctx, const char *filename); + +/* + image_open_document_with_stream: Opens a document. + + Same as image_open_document, but takes a stream instead of a + filename to locate the document to open. Increments the + reference count of the stream. See fz_open_file, + fz_open_file_w or fz_open_fd for opening a stream, and + fz_close for closing an open stream. +*/ +image_document *image_open_document_with_stream(fz_context *ctx, fz_stream *file); + +/* + image_close_document: Closes and frees an opened document. + + The resource store in the context associated with image_document + is emptied. + + Does not throw exceptions. +*/ +void image_close_document(image_document *doc); + +int image_count_pages(image_document *doc); +image_page *image_load_page(image_document *doc, int number); +fz_rect *image_bound_page(image_document *doc, image_page *page, fz_rect *rect); +void image_free_page(image_document *doc, image_page *page); +void image_run_page(image_document *doc, image_page *page, fz_device *dev, const fz_matrix *ctm, fz_cookie *cookie); + +#endif diff --git a/platform/win32/generate.bat b/platform/win32/generate.bat index c10a9d8f..681eaf66 100644 --- a/platform/win32/generate.bat +++ b/platform/win32/generate.bat @@ -1,37 +1,31 @@ @echo off -if not exist scripts/fontdump.c cd .. +if not exist scripts/fontdump.c cd ../.. +if not exist scripts/fontdump.c goto usage if not exist generated mkdir generated -cl /nologo -Iinclude scripts/fontdump.c -cl /nologo -Iinclude scripts/cmapdump.c -cl /nologo -Iinclude scripts/cquote.c -cl /nologo -Iinclude scripts/bin2hex.c +cl /nologo -Iinclude scripts/fontdump.c setargv.obj +cl /nologo -Iinclude scripts/cmapdump.c setargv.obj +cl /nologo -Iinclude scripts/cquote.c setargv.obj +cl /nologo -Iinclude scripts/bin2hex.c setargv.obj if not exist fontdump.exe goto usage if not exist cmapdump.exe goto usage if not exist cquote.exe goto usage if not exist bin2hex.exe goto usage -if not exist generated/gen_font_base14.h fontdump.exe generated/gen_font_base14.h fonts/Dingbats.cff fonts/NimbusMonL-Bold.cff fonts/NimbusMonL-BoldObli.cff fonts/NimbusMonL-Regu.cff fonts/NimbusMonL-ReguObli.cff fonts/NimbusRomNo9L-Medi.cff fonts/NimbusRomNo9L-MediItal.cff fonts/NimbusRomNo9L-Regu.cff fonts/NimbusRomNo9L-ReguItal.cff fonts/NimbusSanL-Bold.cff fonts/NimbusSanL-BoldItal.cff fonts/NimbusSanL-Regu.cff fonts/NimbusSanL-ReguItal.cff fonts/StandardSymL.cff +if not exist generated/gen_font_base14.h fontdump.exe generated/gen_font_base14.h resources/fonts/*.cff +if not exist generated/gen_font_droid.h fontdump.exe generated/gen_font_droid.h resources/fonts/droid/DroidSans.ttf resources/fonts/droid/DroidSansMono.ttf +if not exist generated/gen_font_cjk.h fontdump.exe generated/gen_font_cjk.h resources/fonts/droid/DroidSansFallback.ttf +if not exist generated/gen_font_cjk_full.h fontdump.exe generated/gen_font_cjk_full.h resources/fonts/droid/DroidSansFallbackFull.ttf -if not exist generated/gen_font_droid.h fontdump.exe generated/gen_font_droid.h fonts/droid/DroidSans.ttf fonts/droid/DroidSansMono.ttf +if not exist generated/gen_cmap_cns.h cmapdump.exe generated/gen_cmap_cns.h resources\cmaps\cns\* +if not exist generated/gen_cmap_gb.h cmapdump.exe generated/gen_cmap_gb.h resources\cmaps\gb\* +if not exist generated/gen_cmap_japan.h cmapdump.exe generated/gen_cmap_japan.h resources\cmaps\japan\* +if not exist generated/gen_cmap_korea.h cmapdump.exe generated/gen_cmap_korea.h resources\cmaps\korea\* -if not exist generated/gen_font_cjk.h fontdump.exe generated/gen_font_cjk.h fonts/droid/DroidSansFallback.ttf - -if not exist generated/gen_font_cjk_full.h fontdump.exe generated/gen_font_cjk_full.h fonts/droid/DroidSansFallbackFull.ttf - -if not exist generated/gen_cmap_cns.h cmapdump.exe generated/gen_cmap_cns.h cmaps/cns/Adobe-CNS1-UCS2 cmaps/cns/Adobe-CNS1-0 cmaps/cns/Adobe-CNS1-1 cmaps/cns/Adobe-CNS1-2 cmaps/cns/Adobe-CNS1-3 cmaps/cns/Adobe-CNS1-4 cmaps/cns/Adobe-CNS1-5 cmaps/cns/Adobe-CNS1-6 cmaps/cns/B5-H cmaps/cns/B5-V cmaps/cns/B5pc-H cmaps/cns/B5pc-V cmaps/cns/CNS-EUC-H cmaps/cns/CNS-EUC-V cmaps/cns/CNS1-H cmaps/cns/CNS1-V cmaps/cns/CNS2-H cmaps/cns/CNS2-V cmaps/cns/ETen-B5-H cmaps/cns/ETen-B5-V cmaps/cns/ETenms-B5-H cmaps/cns/ETenms-B5-V cmaps/cns/ETHK-B5-H cmaps/cns/ETHK-B5-V cmaps/cns/HKdla-B5-H cmaps/cns/HKdla-B5-V cmaps/cns/HKdlb-B5-H cmaps/cns/HKdlb-B5-V cmaps/cns/HKgccs-B5-H cmaps/cns/HKgccs-B5-V cmaps/cns/HKm314-B5-H cmaps/cns/HKm314-B5-V cmaps/cns/HKm471-B5-H cmaps/cns/HKm471-B5-V cmaps/cns/HKscs-B5-H cmaps/cns/HKscs-B5-V cmaps/cns/UniCNS-UCS2-H cmaps/cns/UniCNS-UCS2-V cmaps/cns/UniCNS-UTF16-H cmaps/cns/UniCNS-UTF16-V - -if not exist generated/gen_cmap_gb.h cmapdump.exe generated/gen_cmap_gb.h cmaps/gb/Adobe-GB1-UCS2 cmaps/gb/Adobe-GB1-0 cmaps/gb/Adobe-GB1-1 cmaps/gb/Adobe-GB1-2 cmaps/gb/Adobe-GB1-3 cmaps/gb/Adobe-GB1-4 cmaps/gb/Adobe-GB1-5 cmaps/gb/GB-EUC-H cmaps/gb/GB-EUC-V cmaps/gb/GB-H cmaps/gb/GB-V cmaps/gb/GBK-EUC-H cmaps/gb/GBK-EUC-V cmaps/gb/GBK2K-H cmaps/gb/GBK2K-V cmaps/gb/GBKp-EUC-H cmaps/gb/GBKp-EUC-V cmaps/gb/GBpc-EUC-H cmaps/gb/GBpc-EUC-V cmaps/gb/GBT-EUC-H cmaps/gb/GBT-EUC-V cmaps/gb/GBT-H cmaps/gb/GBT-V cmaps/gb/GBTpc-EUC-H cmaps/gb/GBTpc-EUC-V cmaps/gb/UniGB-UCS2-H cmaps/gb/UniGB-UCS2-V cmaps/gb/UniGB-UTF16-H cmaps/gb/UniGB-UTF16-V - -if not exist generated/gen_cmap_japan.h cmapdump.exe generated/gen_cmap_japan.h cmaps/japan/Adobe-Japan1-UCS2 cmaps/japan/78-EUC-H cmaps/japan/78-EUC-V cmaps/japan/78-H cmaps/japan/78-RKSJ-H cmaps/japan/78-RKSJ-V cmaps/japan/78-V cmaps/japan/78ms-RKSJ-H cmaps/japan/78ms-RKSJ-V cmaps/japan/83pv-RKSJ-H cmaps/japan/90ms-RKSJ-H cmaps/japan/90ms-RKSJ-V cmaps/japan/90msp-RKSJ-H cmaps/japan/90msp-RKSJ-V cmaps/japan/90pv-RKSJ-H cmaps/japan/90pv-RKSJ-V cmaps/japan/Add-H cmaps/japan/Add-RKSJ-H cmaps/japan/Add-RKSJ-V cmaps/japan/Add-V cmaps/japan/Adobe-Japan1-0 cmaps/japan/Adobe-Japan1-1 cmaps/japan/Adobe-Japan1-2 cmaps/japan/Adobe-Japan1-3 cmaps/japan/Adobe-Japan1-4 cmaps/japan/Adobe-Japan1-5 cmaps/japan/Adobe-Japan1-6 cmaps/japan/EUC-H cmaps/japan/EUC-V cmaps/japan/Ext-H cmaps/japan/Ext-RKSJ-H cmaps/japan/Ext-RKSJ-V cmaps/japan/Ext-V cmaps/japan/H cmaps/japan/Hankaku cmaps/japan/Hiragana cmaps/japan/Katakana cmaps/japan/NWP-H cmaps/japan/NWP-V cmaps/japan/RKSJ-H cmaps/japan/RKSJ-V cmaps/japan/Roman cmaps/japan/UniJIS-UCS2-H cmaps/japan/UniJIS-UCS2-HW-H cmaps/japan/UniJIS-UCS2-HW-V cmaps/japan/UniJIS-UCS2-V cmaps/japan/UniJISPro-UCS2-HW-V cmaps/japan/UniJISPro-UCS2-V cmaps/japan/V cmaps/japan/WP-Symbol cmaps/japan/Adobe-Japan2-0 cmaps/japan/Hojo-EUC-H cmaps/japan/Hojo-EUC-V cmaps/japan/Hojo-H cmaps/japan/Hojo-V cmaps/japan/UniHojo-UCS2-H cmaps/japan/UniHojo-UCS2-V cmaps/japan/UniHojo-UTF16-H cmaps/japan/UniHojo-UTF16-V cmaps/japan/UniJIS-UTF16-H cmaps/japan/UniJIS-UTF16-V - -if not exist generated/gen_cmap_korea.h cmapdump.exe generated/gen_cmap_korea.h cmaps/korea/Adobe-Korea1-UCS2 cmaps/korea/Adobe-Korea1-0 cmaps/korea/Adobe-Korea1-1 cmaps/korea/Adobe-Korea1-2 cmaps/korea/KSC-EUC-H cmaps/korea/KSC-EUC-V cmaps/korea/KSC-H cmaps/korea/KSC-Johab-H cmaps/korea/KSC-Johab-V cmaps/korea/KSC-V cmaps/korea/KSCms-UHC-H cmaps/korea/KSCms-UHC-HW-H cmaps/korea/KSCms-UHC-HW-V cmaps/korea/KSCms-UHC-V cmaps/korea/KSCpc-EUC-H cmaps/korea/KSCpc-EUC-V cmaps/korea/UniKS-UCS2-H cmaps/korea/UniKS-UCS2-V cmaps/korea/UniKS-UTF16-H cmaps/korea/UniKS-UTF16-V - -if not exist generated/gen_js_util.h cquote.exe generated/gen_js_util.h pdf/pdf_util.js - -if not exist generated/gen_adobe_ca.h bin2hex.exe generated/gen_adobe_ca.h certs/AdobeCA.p7c +if not exist generated/gen_adobe_ca.h bin2hex.exe generated/gen_adobe_ca.h resources/certs/AdobeCA.p7c +if not exist generated/gen_js_util.h cquote.exe generated/gen_js_util.h source/pdf/js/pdf-util.js del cmapdump.obj fontdump.obj cquote.obj bin2hex.obj cmapdump.exe fontdump.exe cquote.exe bin2hex.exe diff --git a/platform/win32/generated.vcproj b/platform/win32/generated.vcproj index 4fef3694..109031a7 100644 --- a/platform/win32/generated.vcproj +++ b/platform/win32/generated.vcproj @@ -43,8 +43,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/platform/win32/libmupdf-js-none.vcproj b/platform/win32/libmupdf-js-none.vcproj new file mode 100644 index 00000000..00ed55de --- /dev/null +++ b/platform/win32/libmupdf-js-none.vcproj @@ -0,0 +1,340 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/libmupdf-js-v8.vcproj b/platform/win32/libmupdf-js-v8.vcproj new file mode 100644 index 00000000..7af2d6f9 --- /dev/null +++ b/platform/win32/libmupdf-js-v8.vcproj @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/libmupdf-nov8.vcproj b/platform/win32/libmupdf-nov8.vcproj deleted file mode 100644 index 108b82a5..00000000 --- a/platform/win32/libmupdf-nov8.vcproj +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform/win32/libmupdf-v8.vcproj b/platform/win32/libmupdf-v8.vcproj deleted file mode 100644 index 36b6ccd8..00000000 --- a/platform/win32/libmupdf-v8.vcproj +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index 9bf997ec..ac9e3707 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -40,7 +40,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="pdf" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index 32576cfe..ac17de00 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -39,7 +39,7 @@ @@ -334,63 +334,63 @@ Name="libjbig2dec" > @@ -398,43 +398,43 @@ Name="libz" > @@ -445,211 +445,211 @@ Name="openjp2" > @@ -658,90 +658,90 @@ Name="libfreetype" > @@ -749,201 +749,201 @@ Name="include" > @@ -951,150 +951,150 @@ Name="internal" > diff --git a/platform/win32/mudraw.vcproj b/platform/win32/mudraw.vcproj index 6310fb06..b28291df 100644 --- a/platform/win32/mudraw.vcproj +++ b/platform/win32/mudraw.vcproj @@ -39,7 +39,7 @@ diff --git a/platform/win32/mujstest-v8.vcproj b/platform/win32/mujstest-v8.vcproj index 1b37bb12..81d93db3 100644 --- a/platform/win32/mujstest-v8.vcproj +++ b/platform/win32/mujstest-v8.vcproj @@ -39,7 +39,7 @@ @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -134,7 +134,7 @@ @@ -264,7 +264,7 @@ @@ -341,7 +341,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="HAVE_OPENSSL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -360,7 +360,7 @@ - - - - - - - - diff --git a/platform/win32/mupdf-v8.vcproj b/platform/win32/mupdf-v8.vcproj index c66c2d99..93c4dbb9 100644 --- a/platform/win32/mupdf-v8.vcproj +++ b/platform/win32/mupdf-v8.vcproj @@ -39,7 +39,7 @@ @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" RuntimeLibrary="0" EnableFunctionLevelLinking="true" WarningLevel="3" @@ -134,7 +134,7 @@ @@ -264,7 +264,7 @@ @@ -341,7 +341,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="HAVE_OPENSSL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -360,7 +360,7 @@ - - - - - - - - diff --git a/platform/win32/mupdf.sln b/platform/win32/mupdf.sln index 7b3de7fa..a179a008 100644 --- a/platform/win32/mupdf.sln +++ b/platform/win32/mupdf.sln @@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mutool", "mutool.vcproj", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generated", "generated.vcproj", "{A5053AA7-02E5-4903-B596-04F17AEB1526}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-v8", "libmupdf-v8.vcproj", "{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-js-v8", "libmupdf-js-v8.vcproj", "{2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}" ProjectSection(ProjectDependencies) = postProject {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection @@ -45,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mujstest-v8", "mujstest-v8. {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D} = {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-nov8", "libmupdf-nov8.vcproj", "{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmupdf-js-none", "libmupdf-js-none.vcproj", "{EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}" ProjectSection(ProjectDependencies) = postProject {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} EndProjectSection @@ -81,14 +81,14 @@ Global {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.ActiveCfg = Debug|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Debug|Win32.Build.0 = Debug|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Memento|Win32.ActiveCfg = Memento|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Memento|Win32.Build.0 = Memento|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.ActiveCfg = Release|Win32 {5F615F91-DFF8-4F05-BF48-6222B7D86519}.Release|Win32.Build.0 = Release|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {5F615F91-DFF8-4F05-BF48-6222B7D86519}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.ActiveCfg = Debug|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.Build.0 = Debug|Win32 {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 @@ -121,14 +121,14 @@ Global {A5053AA7-02E5-4903-B596-04F17AEB1526}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Debug|Win32.ActiveCfg = Debug|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Debug|Win32.Build.0 = Debug|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Memento|Win32.ActiveCfg = Memento|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Memento|Win32.Build.0 = Memento|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Release|Win32.ActiveCfg = Release|Win32 {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.Release|Win32.Build.0 = Release|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {2E5DAFDB-A060-4011-B760-32F6A3A4BC9D}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {9035A4F3-4219-45A5-985D-FBF4D9609713}.Debug|Win32.ActiveCfg = Debug|Win32 {9035A4F3-4219-45A5-985D-FBF4D9609713}.Debug|Win32.Build.0 = Debug|Win32 {9035A4F3-4219-45A5-985D-FBF4D9609713}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 @@ -151,14 +151,14 @@ Global {21E28758-E4D2-4B84-8EC5-B631CEE66B30}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Debug|Win32.ActiveCfg = Debug|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Debug|Win32.Build.0 = Debug|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.ActiveCfg = Debug|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.Build.0 = Debug|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.ActiveCfg = DebugOpenssl|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.DebugOpenssl|Win32.Build.0 = DebugOpenssl|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Memento|Win32.ActiveCfg = Memento|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Memento|Win32.Build.0 = Memento|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Release|Win32.ActiveCfg = Release|Win32 {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.Release|Win32.Build.0 = Release|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.ActiveCfg = Release|Win32 - {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.Build.0 = Release|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.ActiveCfg = ReleaseOpenssl|Win32 + {EC81A9F3-88A6-4170-B7B4-C41CB789A7F6}.ReleaseOpenssl|Win32.Build.0 = ReleaseOpenssl|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/platform/win32/mupdf.vcproj b/platform/win32/mupdf.vcproj index eca2df73..42289186 100644 --- a/platform/win32/mupdf.vcproj +++ b/platform/win32/mupdf.vcproj @@ -39,7 +39,7 @@ @@ -333,7 +333,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\include" + AdditionalIncludeDirectories="..\..\include" PreprocessorDefinitions="HAVE_OPENSSL" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -352,7 +352,7 @@ - - - - - - - - diff --git a/platform/win32/mutool.vcproj b/platform/win32/mutool.vcproj index a208dbc6..891f62c4 100644 --- a/platform/win32/mutool.vcproj +++ b/platform/win32/mutool.vcproj @@ -39,7 +39,7 @@ diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c index 96bed646..cc1534dc 100644 --- a/scripts/cmapdump.c +++ b/scripts/cmapdump.c @@ -8,17 +8,17 @@ #include "mupdf/pdf.h" -#include "../fitz/base_context.c" -#include "../fitz/base_error.c" -#include "../fitz/base_memory.c" -#include "../fitz/base_string.c" -#include "../fitz/stm_buffer.c" -#include "../fitz/stm_open.c" -#include "../fitz/stm_read.c" - -#include "../pdf/pdf_lex.c" -#include "../pdf/pdf_cmap.c" -#include "../pdf/pdf_cmap_parse.c" +#include "../source/fitz/context.c" +#include "../source/fitz/error.c" +#include "../source/fitz/memory.c" +#include "../source/fitz/string.c" +#include "../source/fitz/buffer.c" +#include "../source/fitz/stream-open.c" +#include "../source/fitz/stream-read.c" + +#include "../source/pdf/pdf-lex.c" +#include "../source/pdf/pdf-cmap.c" +#include "../source/pdf/pdf-cmap-parse.c" static void clean(char *p) diff --git a/source/img/muimage.c b/source/img/muimage.c index ed3280b2..759653a7 100644 --- a/source/img/muimage.c +++ b/source/img/muimage.c @@ -1,4 +1,4 @@ -#include "mupdf/image.h" +#include "mupdf/img.h" #include /* for tolower */ -- cgit v1.2.3