diff options
142 files changed, 197 insertions, 202 deletions
@@ -12,7 +12,7 @@ default: all # 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) -Ifitz -Ipdf -Ixps -Icbz -Iimage -Iucdn -Iscripts +CFLAGS += $(XCFLAGS) -Iinclude -Iucdn -Iscripts LIBS += $(XLIBS) -lm include Makerules @@ -58,11 +58,11 @@ RM_CMD = $(QUIET_RM) rm -f $@ # --- Rules --- -FITZ_HDR := fitz/fitz.h fitz/fitz-internal.h -MUPDF_HDR := $(FITZ_HDR) pdf/mupdf.h pdf/mupdf-internal.h -MUXPS_HDR := $(FITZ_HDR) xps/muxps.h xps/muxps-internal.h -MUCBZ_HDR := $(FITZ_HDR) cbz/mucbz.h -MUIMAGE_HDR := $(FITZ_HDR) image/muimage.h +FITZ_HDR := include/mupdf/fitz.h include/mupdf/fitz-internal.h +MUPDF_HDR := $(FITZ_HDR) include/mupdf/pdf.h include/mupdf/pdf-internal.h +MUXPS_HDR := $(FITZ_HDR) include/mupdf/xps.h include/mupdf/xps-internal.h +MUCBZ_HDR := $(FITZ_HDR) include/mupdf/cbz.h +MUIMAGE_HDR := $(FITZ_HDR) include/mupdf/image.h $(OUT) $(GEN) : $(MKDIR_CMD) diff --git a/apps/mudraw.c b/apps/mudraw.c index f2fa53a7..e38aa99b 100644 --- a/apps/mudraw.c +++ b/apps/mudraw.c @@ -2,8 +2,8 @@ * mudraw -- command line tool for drawing pdf/xps/cbz documents */ -#include "fitz.h" -#include "mupdf-internal.h" +#include "mupdf/fitz.h" +#include "mupdf/pdf-internal.h" /* for mujstest */ #ifdef _MSC_VER #include <winsock2.h> diff --git a/apps/mutool.c b/apps/mutool.c index 1d7fb9dd..62355f32 100644 --- a/apps/mutool.c +++ b/apps/mutool.c @@ -2,7 +2,7 @@ * mutool -- swiss army knife of pdf manipulation tools */ -#include <fitz.h> +#include "mupdf/fitz.h" #ifdef _MSC_VER #define main main_utf8 diff --git a/apps/pdfapp.h b/apps/pdfapp.h index 9c8a0ee9..ec87ab12 100644 --- a/apps/pdfapp.h +++ b/apps/pdfapp.h @@ -1,8 +1,7 @@ #ifndef PDFAPP_H #define PDFAPP_H -#include "fitz.h" -#include "mupdf-internal.h" +#include "mupdf/pdf-internal.h" /* * Utility object for handling a pdf application / view diff --git a/apps/pdfclean.c b/apps/pdfclean.c index 78570650..8d1748ae 100644 --- a/apps/pdfclean.c +++ b/apps/pdfclean.c @@ -9,8 +9,8 @@ * TODO: linearize document for fast web view */ -#include "fitz.h" -#include "mupdf-internal.h" +#include "mupdf/fitz.h" +#include "mupdf/pdf-internal.h" static pdf_document *xref = NULL; static fz_context *ctx = NULL; diff --git a/apps/pdfextract.c b/apps/pdfextract.c index f17edff2..d82f045b 100644 --- a/apps/pdfextract.c +++ b/apps/pdfextract.c @@ -2,8 +2,8 @@ * pdfextract -- the ultimate way to extract images and fonts from pdfs */ -#include "mupdf.h" -#include "mupdf-internal.h" +#include "mupdf/pdf.h" +#include "mupdf/pdf-internal.h" static pdf_document *doc = NULL; static fz_context *ctx = NULL; diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c index 18463304..fdc23e99 100644 --- a/apps/pdfinfo.c +++ b/apps/pdfinfo.c @@ -3,8 +3,8 @@ * Print information about the input pdf. */ -#include "fitz.h" -#include "mupdf-internal.h" +#include "mupdf/fitz.h" +#include "mupdf/pdf-internal.h" pdf_document *xref; fz_context *ctx; diff --git a/apps/pdfposter.c b/apps/pdfposter.c index b9514892..c92de7aa 100644 --- a/apps/pdfposter.c +++ b/apps/pdfposter.c @@ -9,8 +9,8 @@ * TODO: linearize document for fast web view */ -#include "fitz.h" -#include "mupdf-internal.h" +#include "mupdf/fitz.h" +#include "mupdf/pdf-internal.h" static int x_factor = 0; static int y_factor = 0; diff --git a/apps/pdfshow.c b/apps/pdfshow.c index 02cf6dbb..78573e10 100644 --- a/apps/pdfshow.c +++ b/apps/pdfshow.c @@ -2,7 +2,7 @@ * pdfshow -- the ultimate pdf debugging tool */ -#include "mupdf-internal.h" +#include "mupdf/pdf-internal.h" static pdf_document *doc = NULL; static fz_context *ctx = NULL; diff --git a/apps/x11_image.c b/apps/x11_image.c index e8cd4455..4f2db2e8 100644 --- a/apps/x11_image.c +++ b/apps/x11_image.c @@ -12,7 +12,7 @@ #define noSHOWINFO -#include "fitz.h" +#include "mupdf/fitz.h" #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/cbz/mucbz.c b/cbz/mucbz.c index aa3652b3..043b6409 100644 --- a/cbz/mucbz.c +++ b/cbz/mucbz.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mucbz.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/cbz.h" #include <zlib.h> diff --git a/doc/example.c b/doc/example.c index e50d0e21..1a21c200 100644 --- a/doc/example.c +++ b/doc/example.c @@ -2,15 +2,12 @@ // Compile a debug build of mupdf, then compile and run this example: // -// gcc -g -o build/debug/example -I fitz doc/example.c \ -// build/debug/libfitz.a build/debug/libfreetype.a \ -// build/debug/libopenjpeg.a build/debug/libjbig2dec.a \ -// build/debug/libjpeg.a -lm +// gcc -g -o build/debug/example -Iinclude doc/example.c build/debug/lib*.a -lm // // build/debug/example /path/to/document.pdf 1 200 25 // Include the MuPDF header file. -#include <fitz.h> +#include <mupdf/fitz.h> void render(char *filename, int pagenumber, int zoom, int rotation) diff --git a/doc/multi-threaded.c b/doc/multi-threaded.c index c6a3d652..3141e3c4 100644 --- a/doc/multi-threaded.c +++ b/doc/multi-threaded.c @@ -13,10 +13,8 @@ // Compile a debug build of mupdf, then compile and run this example: // -// gcc -g -o build/debug/example-mt -I fitz doc/multi-threading.c \ -// build/debug/libfitz.a build/debug/libfreetype.a \ -// build/debug/libopenjpeg.a build/debug/libjbig2dec.a \ -// build/debug/libjpeg.a -lpthread -lm +// gcc -g -o build/debug/example-mt -Iinclude doc/multi-threading.c \ +// build/debug/lib*.a -lpthread -lm // // build/debug/example-mt /path/to/document.pdf // @@ -26,7 +24,7 @@ // depending on your environment. // Include the MuPDF header file, and pthread's header file. -#include <fitz.h> +#include <mupdf/fitz.h> #include <pthread.h> // A convenience function for dying abruptly on pthread errors. diff --git a/draw/draw_affine.c b/draw/draw_affine.c index 5d4ca5b5..9ee1d50c 100644 --- a/draw/draw_affine.c +++ b/draw/draw_affine.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" typedef unsigned char byte; diff --git a/draw/draw_blend.c b/draw/draw_blend.c index c3d9bdff..70a3e1af 100644 --- a/draw/draw_blend.c +++ b/draw/draw_blend.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* PDF 1.4 blend modes. These are slow. */ diff --git a/draw/draw_device.c b/draw/draw_device.c index c6f55224..e7287963 100644 --- a/draw/draw_device.c +++ b/draw/draw_device.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define QUANT(x,a) (((int)((x) * (a))) / (a)) #define HSUBPIX 5.0 diff --git a/draw/draw_edge.c b/draw/draw_edge.c index 138fbcd9..137edc62 100644 --- a/draw/draw_edge.c +++ b/draw/draw_edge.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define BBOX_MIN -(1<<20) #define BBOX_MAX (1<<20) diff --git a/draw/draw_glyph.c b/draw/draw_glyph.c index 88856658..e8d47c0b 100644 --- a/draw/draw_glyph.c +++ b/draw/draw_glyph.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define MAX_GLYPH_SIZE 256 #define MAX_CACHE_SIZE (1024*1024) diff --git a/draw/draw_mesh.c b/draw/draw_mesh.c index 3f60130b..3fa783f0 100644 --- a/draw/draw_mesh.c +++ b/draw/draw_mesh.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" enum { MAXN = 2 + FZ_MAX_COLORS }; diff --git a/draw/draw_paint.c b/draw/draw_paint.c index be8ea20b..1fccec1f 100644 --- a/draw/draw_paint.c +++ b/draw/draw_paint.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* diff --git a/draw/draw_path.c b/draw/draw_path.c index 1d0ef35a..601b6e9c 100644 --- a/draw/draw_path.c +++ b/draw/draw_path.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define MAX_DEPTH 8 diff --git a/draw/draw_scale.c b/draw/draw_scale.c index 7db0fe6c..370bd549 100644 --- a/draw/draw_scale.c +++ b/draw/draw_scale.c @@ -6,7 +6,7 @@ given by taking the source pixmap src, scaling it to width w, and height h, and then positioning it at (frac(x),frac(y)). */ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Do we special case handling of single pixel high/wide images? The * 'purest' handling is given by not special casing them, but certain diff --git a/draw/draw_simple_scale.c b/draw/draw_simple_scale.c index 9bf6857f..81b4a845 100644 --- a/draw/draw_simple_scale.c +++ b/draw/draw_simple_scale.c @@ -10,7 +10,7 @@ that return values strictly in the 0..1 range, and uses bytes for intermediate results rather than ints. */ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Do we special case handling of single pixel high/wide images? The * 'purest' handling is given by not special casing them, but certain diff --git a/draw/draw_unpack.c b/draw/draw_unpack.c index e7952d04..7951b6ef 100644 --- a/draw/draw_unpack.c +++ b/draw/draw_unpack.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Unpack image samples and optionally pad pixels with opaque alpha */ diff --git a/fitz/base_context.c b/fitz/base_context.c index 683ad7dd..93e4fe92 100644 --- a/fitz/base_context.c +++ b/fitz/base_context.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" struct fz_id_context_s { diff --git a/fitz/base_error.c b/fitz/base_error.c index c3c14a1d..d9ad770b 100644 --- a/fitz/base_error.c +++ b/fitz/base_error.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Warning context */ diff --git a/fitz/base_geometry.c b/fitz/base_geometry.c index 9c03d7e2..f5e7cc91 100644 --- a/fitz/base_geometry.c +++ b/fitz/base_geometry.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define MAX4(a,b,c,d) fz_max(fz_max(a,b), fz_max(c,d)) #define MIN4(a,b,c,d) fz_min(fz_min(a,b), fz_min(c,d)) diff --git a/fitz/base_hash.c b/fitz/base_hash.c index 22b64ec6..b66a7a87 100644 --- a/fitz/base_hash.c +++ b/fitz/base_hash.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Simple hashtable with open addressing linear probe. diff --git a/fitz/base_memory.c b/fitz/base_memory.c index 7a38c401..91881e45 100644 --- a/fitz/base_memory.c +++ b/fitz/base_memory.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Enable FITZ_DEBUG_LOCKING_TIMES below if you want to check the times * for which locks are held too. */ diff --git a/fitz/base_string.c b/fitz/base_string.c index d61f8cf3..d584b570 100644 --- a/fitz/base_string.c +++ b/fitz/base_string.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" char * fz_strsep(char **stringp, const char *delim) diff --git a/fitz/base_time.c b/fitz/base_time.c index 9292c4f5..0e3d21b5 100644 --- a/fitz/base_time.c +++ b/fitz/base_time.c @@ -1,6 +1,7 @@ #ifdef _MSC_VER -#include "fitz.h" +#include "mupdf/fitz.h" + #include <time.h> #include <windows.h> diff --git a/fitz/base_trans.c b/fitz/base_trans.c index dcca6e15..81a08735 100644 --- a/fitz/base_trans.c +++ b/fitz/base_trans.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" static int fade(fz_pixmap *tpix, fz_pixmap *opix, fz_pixmap *npix, int time) diff --git a/fitz/base_xml.c b/fitz/base_xml.c index 170ee93d..f2cf04bb 100644 --- a/fitz/base_xml.c +++ b/fitz/base_xml.c @@ -1,4 +1,4 @@ -#include "fitz.h" +#include "mupdf/fitz.h" struct parser { diff --git a/fitz/crypt_aes.c b/fitz/crypt_aes.c index 27db64fc..eb5d260f 100644 --- a/fitz/crypt_aes.c +++ b/fitz/crypt_aes.c @@ -36,7 +36,7 @@ * http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf */ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define aes_context fz_aes diff --git a/fitz/crypt_arc4.c b/fitz/crypt_arc4.c index 596bf652..1f15dd25 100644 --- a/fitz/crypt_arc4.c +++ b/fitz/crypt_arc4.c @@ -21,7 +21,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" void fz_arc4_init(fz_arc4 *arc4, const unsigned char *key, unsigned keylen) diff --git a/fitz/crypt_md5.c b/fitz/crypt_md5.c index 87c0909d..3c896379 100644 --- a/fitz/crypt_md5.c +++ b/fitz/crypt_md5.c @@ -23,7 +23,7 @@ These notices must be retained in any copies of any part of this documentation and/or software. */ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Constants for MD5Transform routine */ enum diff --git a/fitz/crypt_pkcs7.c b/fitz/crypt_pkcs7.c index 4763e886..b4f63cb7 100644 --- a/fitz/crypt_pkcs7.c +++ b/fitz/crypt_pkcs7.c @@ -1,4 +1,4 @@ -#include "mupdf-internal.h" +#include "mupdf/pdf-internal.h" #ifdef HAVE_OPENSSL diff --git a/fitz/crypt_sha2.c b/fitz/crypt_sha2.c index dee0ccf7..62df2506 100644 --- a/fitz/crypt_sha2.c +++ b/fitz/crypt_sha2.c @@ -9,7 +9,7 @@ You can do whatever you want with this file. SHA-384 and SHA-512 were also taken from Crypto++ and adapted for fitz. */ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" static inline int isbigendian(void) { diff --git a/fitz/dev_bbox.c b/fitz/dev_bbox.c index 7f083525..d9077ed9 100644 --- a/fitz/dev_bbox.c +++ b/fitz/dev_bbox.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define STACK_SIZE 96 diff --git a/fitz/dev_list.c b/fitz/dev_list.c index 972c4ba5..5de71cc9 100644 --- a/fitz/dev_list.c +++ b/fitz/dev_list.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" typedef struct fz_display_node_s fz_display_node; diff --git a/fitz/dev_null.c b/fitz/dev_null.c index 5cd1605a..14bcc292 100644 --- a/fitz/dev_null.c +++ b/fitz/dev_null.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_device * fz_new_device(fz_context *ctx, void *user) diff --git a/fitz/dev_svg.c b/fitz/dev_svg.c index f57ee937..99457d20 100644 --- a/fitz/dev_svg.c +++ b/fitz/dev_svg.c @@ -1,4 +1,4 @@ -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" typedef struct svg_device_s svg_device; diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c index 9b6cd1b5..e157e9cc 100644 --- a/fitz/dev_trace.c +++ b/fitz/dev_trace.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" static void fz_trace_matrix(const fz_matrix *ctm) diff --git a/fitz/doc_document.c b/fitz/doc_document.c index 9b494903..673aba3f 100644 --- a/fitz/doc_document.c +++ b/fitz/doc_document.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Yuck! Promiscuous we are. */ extern struct pdf_document *pdf_open_document(fz_context *ctx, const char *filename); diff --git a/fitz/doc_link.c b/fitz/doc_link.c index 26b57e4c..730d4110 100644 --- a/fitz/doc_link.c +++ b/fitz/doc_link.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" void fz_free_link_dest(fz_context *ctx, fz_link_dest *dest) diff --git a/fitz/doc_outline.c b/fitz/doc_outline.c index 2f23573e..d3604bdf 100644 --- a/fitz/doc_outline.c +++ b/fitz/doc_outline.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" void fz_free_outline(fz_context *ctx, fz_outline *outline) diff --git a/fitz/filt_basic.c b/fitz/filt_basic.c index 6f07edd6..2446d41d 100644 --- a/fitz/filt_basic.c +++ b/fitz/filt_basic.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Pretend we have a filter that just copies data forever */ diff --git a/fitz/filt_dctd.c b/fitz/filt_dctd.c index 6fec2c9b..196b7a73 100644 --- a/fitz/filt_dctd.c +++ b/fitz/filt_dctd.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #include <jpeglib.h> #include <setjmp.h> diff --git a/fitz/filt_faxd.c b/fitz/filt_faxd.c index 463d9de1..27accedb 100644 --- a/fitz/filt_faxd.c +++ b/fitz/filt_faxd.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Fax G3/G4 decoder */ diff --git a/fitz/filt_flate.c b/fitz/filt_flate.c index 24b6c081..155f6c78 100644 --- a/fitz/filt_flate.c +++ b/fitz/filt_flate.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #include <zlib.h> diff --git a/fitz/filt_jbig2d.c b/fitz/filt_jbig2d.c index d7f09cee..14683954 100644 --- a/fitz/filt_jbig2d.c +++ b/fitz/filt_jbig2d.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #include <jbig2.h> diff --git a/fitz/filt_lzwd.c b/fitz/filt_lzwd.c index 7b65fa28..4f8b96b7 100644 --- a/fitz/filt_lzwd.c +++ b/fitz/filt_lzwd.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* TODO: error checking */ diff --git a/fitz/filt_predict.c b/fitz/filt_predict.c index 015d4a13..3387a66d 100644 --- a/fitz/filt_predict.c +++ b/fitz/filt_predict.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* TODO: check if this works with 16bpp images */ diff --git a/fitz/image_jpeg.c b/fitz/image_jpeg.c index bd7a6d5b..2ab83180 100644 --- a/fitz/image_jpeg.c +++ b/fitz/image_jpeg.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #include <jpeglib.h> diff --git a/fitz/image_jpx.c b/fitz/image_jpx.c index a77fb19b..be7368f4 100644 --- a/fitz/image_jpx.c +++ b/fitz/image_jpx.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Without the definition of OPJ_STATIC, compilation fails on windows * due to the use of __stdcall. We believe it is required on some diff --git a/fitz/image_md5.c b/fitz/image_md5.c index 86ba0a12..3e479d69 100644 --- a/fitz/image_md5.c +++ b/fitz/image_md5.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" void fz_md5_pixmap(fz_pixmap *pix, unsigned char digest[16]) { diff --git a/fitz/image_png.c b/fitz/image_png.c index 1adaaf7a..a86f4b56 100644 --- a/fitz/image_png.c +++ b/fitz/image_png.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #include <zlib.h> diff --git a/fitz/image_save.c b/fitz/image_save.c index 8695002b..b44323ab 100644 --- a/fitz/image_save.c +++ b/fitz/image_save.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" void fz_write_pixmap(fz_context *ctx, fz_pixmap *img, char *file, int rgb) { diff --git a/fitz/image_tiff.c b/fitz/image_tiff.c index 7a372214..1249927f 100644 --- a/fitz/image_tiff.c +++ b/fitz/image_tiff.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* * TIFF image loader. Should be enough to support TIFF files in XPS. diff --git a/fitz/memento.c b/fitz/memento.c index 086504a7..6a159f10 100644 --- a/fitz/memento.c +++ b/fitz/memento.c @@ -39,7 +39,7 @@ void *memset(void *,int,size_t); #endif int atexit(void (*)(void)); #else -#include "memento.h" +#include "mupdf/memento.h" #include <stdio.h> #include <stdlib.h> #endif diff --git a/fitz/res_bitmap.c b/fitz/res_bitmap.c index af70f983..c31e85b4 100644 --- a/fitz/res_bitmap.c +++ b/fitz/res_bitmap.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_bitmap * fz_new_bitmap(fz_context *ctx, int w, int h, int n, int xres, int yres) diff --git a/fitz/res_colorspace.c b/fitz/res_colorspace.c index 9603f46d..2486799d 100644 --- a/fitz/res_colorspace.c +++ b/fitz/res_colorspace.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define SLOWCMYK diff --git a/fitz/res_font.c b/fitz/res_font.c index db2ffe5d..5f8721f6 100644 --- a/fitz/res_font.c +++ b/fitz/res_font.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #include <ft2build.h> #include FT_FREETYPE_H diff --git a/fitz/res_func.c b/fitz/res_func.c index a8ffa907..53f0d2c9 100644 --- a/fitz/res_func.c +++ b/fitz/res_func.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" void fz_eval_function(fz_context *ctx, fz_function *func, float *in_, int inlen, float *out_, int outlen) diff --git a/fitz/res_halftone.c b/fitz/res_halftone.c index b0094cb4..0472a8d9 100644 --- a/fitz/res_halftone.c +++ b/fitz/res_halftone.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_halftone * fz_new_halftone(fz_context *ctx, int comps) diff --git a/fitz/res_image.c b/fitz/res_image.c index 4aac14ae..06d1f2f0 100644 --- a/fitz/res_image.c +++ b/fitz/res_image.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_pixmap * fz_image_to_pixmap(fz_context *ctx, fz_image *image, int w, int h) diff --git a/fitz/res_path.c b/fitz/res_path.c index b2e4f6f5..142928b9 100644 --- a/fitz/res_path.c +++ b/fitz/res_path.c @@ -1,5 +1,5 @@ #include <assert.h> -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_path * fz_new_path(fz_context *ctx) diff --git a/fitz/res_pcl.c b/fitz/res_pcl.c index 0cbf6c3c..e456f401 100644 --- a/fitz/res_pcl.c +++ b/fitz/res_pcl.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Lifted from ghostscript gdevjlm.h */ /* diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c index e45a6e9c..c528a77d 100644 --- a/fitz/res_pixmap.c +++ b/fitz/res_pixmap.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_pixmap * fz_keep_pixmap(fz_context *ctx, fz_pixmap *pix) diff --git a/fitz/res_pwg.c b/fitz/res_pwg.c index ea2ef588..0cdcc771 100644 --- a/fitz/res_pwg.c +++ b/fitz/res_pwg.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" void fz_output_pwg_file_header(fz_output *out) diff --git a/fitz/res_shade.c b/fitz/res_shade.c index c678bd17..0bbbeae3 100644 --- a/fitz/res_shade.c +++ b/fitz/res_shade.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define SWAP(a,b) {fz_vertex *t = (a); (a) = (b); (b) = t;} diff --git a/fitz/res_store.c b/fitz/res_store.c index 2cb16c7f..5b25f197 100644 --- a/fitz/res_store.c +++ b/fitz/res_store.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" typedef struct fz_item_s fz_item; diff --git a/fitz/res_text.c b/fitz/res_text.c index 54c7691e..28142e2c 100644 --- a/fitz/res_text.c +++ b/fitz/res_text.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_text * fz_new_text(fz_context *ctx, fz_font *font, const fz_matrix *trm, int wmode) diff --git a/fitz/stm_buffer.c b/fitz/stm_buffer.c index 55c057f0..40adff0c 100644 --- a/fitz/stm_buffer.c +++ b/fitz/stm_buffer.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_buffer * fz_new_buffer(fz_context *ctx, int size) diff --git a/fitz/stm_comp_buf.c b/fitz/stm_comp_buf.c index e6a167b5..77f7b741 100644 --- a/fitz/stm_comp_buf.c +++ b/fitz/stm_comp_buf.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* This code needs to be kept out of stm_buffer.c to avoid it being * pulled into cmapdump.c */ diff --git a/fitz/stm_open.c b/fitz/stm_open.c index ffa6de82..3b2eb53f 100644 --- a/fitz/stm_open.c +++ b/fitz/stm_open.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" fz_stream * fz_new_stream(fz_context *ctx, void *state, diff --git a/fitz/stm_output.c b/fitz/stm_output.c index 7c181a9c..ff9e866b 100644 --- a/fitz/stm_output.c +++ b/fitz/stm_output.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" static int file_printf(fz_output *out, const char *fmt, va_list ap) diff --git a/fitz/stm_read.c b/fitz/stm_read.c index 84fd877f..a0988f46 100644 --- a/fitz/stm_read.c +++ b/fitz/stm_read.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define MIN_BOMB (100 << 20) diff --git a/fitz/text_extract.c b/fitz/text_extract.c index 01a789fd..cf32ae53 100644 --- a/fitz/text_extract.c +++ b/fitz/text_extract.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #include "ucdn.h" /* Extract text into an unsorted span soup. */ diff --git a/fitz/text_output.c b/fitz/text_output.c index c4af4160..b3af936f 100644 --- a/fitz/text_output.c +++ b/fitz/text_output.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" #define SUBSCRIPT_OFFSET 0.2f #define SUPERSCRIPT_OFFSET -0.2f diff --git a/fitz/text_paragraph.c b/fitz/text_paragraph.c index c0fc42d2..df626f5e 100644 --- a/fitz/text_paragraph.c +++ b/fitz/text_paragraph.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" /* Assemble span soup into blocks and lines. */ diff --git a/fitz/text_search.c b/fitz/text_search.c index 9b0a3acf..a90a682f 100644 --- a/fitz/text_search.c +++ b/fitz/text_search.c @@ -1,4 +1,4 @@ -#include "fitz-internal.h" +#include "mupdf/fitz-internal.h" static inline int fz_tolower(int c) { diff --git a/image/muimage.c b/image/muimage.c index 6df668e2..cbaae139 100644 --- a/image/muimage.c +++ b/image/muimage.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "muimage.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/image.h" #include <ctype.h> /* for tolower */ diff --git a/cbz/mucbz.h b/include/mupdf/cbz.h index 0dd47b6e..858b6ec9 100644 --- a/cbz/mucbz.h +++ b/include/mupdf/cbz.h @@ -1,7 +1,7 @@ #ifndef MUCBZ_H #define MUCBZ_H -#include "fitz.h" +#include "mupdf/fitz.h" typedef struct cbz_document_s cbz_document; typedef struct cbz_page_s cbz_page; diff --git a/fitz/fitz-internal.h b/include/mupdf/fitz-internal.h index 37e83df8..df6cceea 100644 --- a/fitz/fitz-internal.h +++ b/include/mupdf/fitz-internal.h @@ -1,7 +1,7 @@ #ifndef FITZ_INTERNAL_H #define FITZ_INTERNAL_H -#include "fitz.h" +#include "mupdf/fitz.h" #ifdef _WIN32 /* Microsoft Visual C++ */ diff --git a/fitz/fitz.h b/include/mupdf/fitz.h index e3427baf..02104b05 100644 --- a/fitz/fitz.h +++ b/include/mupdf/fitz.h @@ -21,7 +21,7 @@ #include <setjmp.h> -#include "memento.h" +#include "mupdf/memento.h" #ifdef __APPLE__ #define HAVE_SIGSETJMP diff --git a/image/muimage.h b/include/mupdf/image.h index 146132f0..4c10b0d3 100644 --- a/image/muimage.h +++ b/include/mupdf/image.h @@ -1,7 +1,7 @@ #ifndef MUIMAGE_H #define MUIMAGE_H -#include "fitz.h" +#include "mupdf/fitz.h" typedef struct image_document_s image_document; typedef struct image_page_s image_page; diff --git a/fitz/memento.h b/include/mupdf/memento.h index 1886ceb8..1886ceb8 100644 --- a/fitz/memento.h +++ b/include/mupdf/memento.h diff --git a/pdf/mupdf-internal.h b/include/mupdf/pdf-internal.h index c0860d12..4a3f913c 100644 --- a/pdf/mupdf-internal.h +++ b/include/mupdf/pdf-internal.h @@ -1,8 +1,8 @@ #ifndef MUPDF_INTERNAL_H #define MUPDF_INTERNAL_H -#include "mupdf.h" -#include "fitz-internal.h" +#include "mupdf/pdf.h" +#include "mupdf/fitz-internal.h" void pdf_set_str_len(pdf_obj *obj, int newlen); void *pdf_get_indirect_document(pdf_obj *obj); diff --git a/pdf/mupdf.h b/include/mupdf/pdf.h index 3546daed..d7173972 100644 --- a/pdf/mupdf.h +++ b/include/mupdf/pdf.h @@ -1,7 +1,7 @@ #ifndef MUPDF_H #define MUPDF_H -#include "fitz.h" +#include "mupdf/fitz.h" typedef struct pdf_document_s pdf_document; diff --git a/xps/muxps-internal.h b/include/mupdf/xps-internal.h index 438f5f13..a2c089e5 100644 --- a/xps/muxps-internal.h +++ b/include/mupdf/xps-internal.h @@ -1,8 +1,8 @@ #ifndef MUXPS_INTERNAL_H #define MUXPS_INTERNAL_H -#include "muxps.h" -#include "fitz-internal.h" +#include "mupdf/xps.h" +#include "mupdf/fitz-internal.h" typedef unsigned char byte; diff --git a/xps/muxps.h b/include/mupdf/xps.h index cb17c8b4..2de11500 100644 --- a/xps/muxps.h +++ b/include/mupdf/xps.h @@ -1,7 +1,7 @@ #ifndef MUXPS_H #define MUXPS_H -#include "fitz.h" +#include "mupdf/fitz.h" typedef struct xps_document_s xps_document; typedef struct xps_page_s xps_page; diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c index 37c89902..d32a276b 100644 --- a/pdf/pdf_annot.c +++ b/pdf/pdf_annot.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #define SMALL_FLOAT (0.00001) diff --git a/pdf/pdf_cmap.c b/pdf/pdf_cmap.c index 0b5e4645..100a8a3f 100644 --- a/pdf/pdf_cmap.c +++ b/pdf/pdf_cmap.c @@ -15,8 +15,8 @@ * or can trust the parser to give us optimal mappings. */ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* Macros for accessing the combined extent_flags field */ #define pdf_range_high(r) ((r)->low + ((r)->extent_flags >> 2)) diff --git a/pdf/pdf_cmap_load.c b/pdf/pdf_cmap_load.c index 36ca202b..b3374ab2 100644 --- a/pdf/pdf_cmap_load.c +++ b/pdf/pdf_cmap_load.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" unsigned int pdf_cmap_size(fz_context *ctx, pdf_cmap *cmap) diff --git a/pdf/pdf_cmap_parse.c b/pdf/pdf_cmap_parse.c index e2335de4..435fcd44 100644 --- a/pdf/pdf_cmap_parse.c +++ b/pdf/pdf_cmap_parse.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* * CMap parser diff --git a/pdf/pdf_cmap_table.c b/pdf/pdf_cmap_table.c index 21dfe5fa..8c4d0b26 100644 --- a/pdf/pdf_cmap_table.c +++ b/pdf/pdf_cmap_table.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #ifndef NOCJK #include "../generated/cmap_cns.h" diff --git a/pdf/pdf_colorspace.c b/pdf/pdf_colorspace.c index c2fa106a..1894e284 100644 --- a/pdf/pdf_colorspace.c +++ b/pdf/pdf_colorspace.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* ICCBased */ diff --git a/pdf/pdf_crypt.c b/pdf/pdf_crypt.c index 54579570..8cfa59e4 100644 --- a/pdf/pdf_crypt.c +++ b/pdf/pdf_crypt.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" enum { diff --git a/pdf/pdf_device.c b/pdf/pdf_device.c index 608e6eb8..56d4ef86 100644 --- a/pdf/pdf_device.c +++ b/pdf/pdf_device.c @@ -1,4 +1,4 @@ -#include "mupdf-internal.h" +#include "mupdf/pdf-internal.h" typedef struct pdf_device_s pdf_device; diff --git a/pdf/pdf_encoding.c b/pdf/pdf_encoding.c index eb36ed96..51956a6c 100644 --- a/pdf/pdf_encoding.c +++ b/pdf/pdf_encoding.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #include "data_encodings.h" #include "data_glyphlist.h" diff --git a/pdf/pdf_event.c b/pdf/pdf_event.c index 0573140c..3ece04e8 100644 --- a/pdf/pdf_event.c +++ b/pdf/pdf_event.c @@ -1,5 +1,5 @@ -#include "fitz.h" -#include "mupdf-internal.h" +#include "mupdf/fitz.h" +#include "mupdf/pdf-internal.h" typedef struct { diff --git a/pdf/pdf_field.c b/pdf/pdf_field.c index 699f4acb..8c08828d 100644 --- a/pdf/pdf_field.c +++ b/pdf/pdf_field.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" pdf_obj *pdf_get_inheritable(pdf_document *doc, pdf_obj *obj, char *key) { diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c index 742602e3..84c56c47 100644 --- a/pdf/pdf_font.c +++ b/pdf/pdf_font.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #include <ft2build.h> #include FT_FREETYPE_H diff --git a/pdf/pdf_fontfile.c b/pdf/pdf_fontfile.c index 99565da5..8decb50f 100644 --- a/pdf/pdf_fontfile.c +++ b/pdf/pdf_fontfile.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* Which fonts are embedded is based on a few preprocessor definitions. diff --git a/pdf/pdf_form.c b/pdf/pdf_form.c index 37413caf..45242b92 100644 --- a/pdf/pdf_form.c +++ b/pdf/pdf_form.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #define MATRIX_COEFS (6) diff --git a/pdf/pdf_function.c b/pdf/pdf_function.c index dff0a8fb..172d0760 100644 --- a/pdf/pdf_function.c +++ b/pdf/pdf_function.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" typedef struct psobj_s psobj; diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c index 1b6cebaf..ee5be441 100644 --- a/pdf/pdf_image.c +++ b/pdf/pdf_image.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" static fz_image *pdf_load_jpx(pdf_document *xref, pdf_obj *dict, int forcemask); diff --git a/pdf/pdf_interpret.c b/pdf/pdf_interpret.c index 44a12ce8..fc6b7b6d 100644 --- a/pdf/pdf_interpret.c +++ b/pdf/pdf_interpret.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #define TILE diff --git a/pdf/pdf_js.c b/pdf/pdf_js.c index cbaf9081..ec0570f1 100644 --- a/pdf/pdf_js.c +++ b/pdf/pdf_js.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" struct pdf_js_s { diff --git a/pdf/pdf_js_none.c b/pdf/pdf_js_none.c index dc06f039..dc0124bc 100644 --- a/pdf/pdf_js_none.c +++ b/pdf/pdf_js_none.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" pdf_js *pdf_new_js(pdf_document *doc) { diff --git a/pdf/pdf_jsimp_cpp.c b/pdf/pdf_jsimp_cpp.c index c521f239..ac815639 100644 --- a/pdf/pdf_jsimp_cpp.c +++ b/pdf/pdf_jsimp_cpp.c @@ -2,8 +2,8 @@ * in C++, from which calls to fz_throw aren't safe. The C++ versions * return errors explicitly, and these wrappers then throw them. */ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #include "pdf_jsimp_cpp.h" pdf_jsimp *pdf_new_jsimp(fz_context *ctx, void *jsctx) diff --git a/pdf/pdf_lex.c b/pdf/pdf_lex.c index 30d18ea7..f23c00d4 100644 --- a/pdf/pdf_lex.c +++ b/pdf/pdf_lex.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #define IS_NUMBER \ '+':case'-':case'.':case'0':case'1':case'2':case'3':\ diff --git a/pdf/pdf_metrics.c b/pdf/pdf_metrics.c index 7c09ad4e..06161d60 100644 --- a/pdf/pdf_metrics.c +++ b/pdf/pdf_metrics.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" void pdf_set_font_wmode(fz_context *ctx, pdf_font_desc *font, int wmode) diff --git a/pdf/pdf_nametree.c b/pdf/pdf_nametree.c index b175456e..6d83ae41 100644 --- a/pdf/pdf_nametree.c +++ b/pdf/pdf_nametree.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" static pdf_obj * pdf_lookup_name_imp(fz_context *ctx, pdf_obj *node, pdf_obj *needle) diff --git a/pdf/pdf_object.c b/pdf/pdf_object.c index c3092afe..3eefede1 100644 --- a/pdf/pdf_object.c +++ b/pdf/pdf_object.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" typedef enum pdf_objkind_e { diff --git a/pdf/pdf_outline.c b/pdf/pdf_outline.c index fb750b9f..cbfdb230 100644 --- a/pdf/pdf_outline.c +++ b/pdf/pdf_outline.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" static fz_outline * pdf_load_outline_imp(pdf_document *xref, pdf_obj *dict) diff --git a/pdf/pdf_page.c b/pdf/pdf_page.c index c86cc6ee..c4cdbf6b 100644 --- a/pdf/pdf_page.c +++ b/pdf/pdf_page.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" struct info { diff --git a/pdf/pdf_parse.c b/pdf/pdf_parse.c index 373ad0e8..d7648e2a 100644 --- a/pdf/pdf_parse.c +++ b/pdf/pdf_parse.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" fz_rect * pdf_to_rect(fz_context *ctx, pdf_obj *array, fz_rect *r) diff --git a/pdf/pdf_pattern.c b/pdf/pdf_pattern.c index 5647106b..d388f5d7 100644 --- a/pdf/pdf_pattern.c +++ b/pdf/pdf_pattern.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" pdf_pattern * pdf_keep_pattern(fz_context *ctx, pdf_pattern *pat) diff --git a/pdf/pdf_repair.c b/pdf/pdf_repair.c index 20b5b469..398edf94 100644 --- a/pdf/pdf_repair.c +++ b/pdf/pdf_repair.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* Scan file for objects and reconstruct xref table */ diff --git a/pdf/pdf_shade.c b/pdf/pdf_shade.c index f74910f8..f8004cfb 100644 --- a/pdf/pdf_shade.c +++ b/pdf/pdf_shade.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* FIXME: Remove this somehow */ #define FUNSEGS 32 /* size of sampled mesh for function-based shadings */ diff --git a/pdf/pdf_store.c b/pdf/pdf_store.c index 9e03cff9..9fb7777d 100644 --- a/pdf/pdf_store.c +++ b/pdf/pdf_store.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" static int pdf_make_hash_key(fz_store_hash *hash, void *key_) diff --git a/pdf/pdf_stream.c b/pdf/pdf_stream.c index 50cb78ee..37f04b02 100644 --- a/pdf/pdf_stream.c +++ b/pdf/pdf_stream.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* * Check if an object is a stream or not. diff --git a/pdf/pdf_type3.c b/pdf/pdf_type3.c index 047f9ef1..95ce8b79 100644 --- a/pdf/pdf_type3.c +++ b/pdf/pdf_type3.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" static void pdf_run_glyph_func(void *doc, void *rdb, fz_buffer *contents, fz_device *dev, const fz_matrix *ctm, void *gstate, int nested_depth) diff --git a/pdf/pdf_unicode.c b/pdf/pdf_unicode.c index a6e14d9b..ba7dad44 100644 --- a/pdf/pdf_unicode.c +++ b/pdf/pdf_unicode.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* Load or synthesize ToUnicode map for fonts */ diff --git a/pdf/pdf_write.c b/pdf/pdf_write.c index 7906413f..c76fdee3 100644 --- a/pdf/pdf_write.c +++ b/pdf/pdf_write.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* #define DEBUG_LINEARIZATION */ /* #define DEBUG_HEAP_SORT */ diff --git a/pdf/pdf_xobject.c b/pdf/pdf_xobject.c index 525c04ae..ff751fe0 100644 --- a/pdf/pdf_xobject.c +++ b/pdf/pdf_xobject.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" pdf_xobject * pdf_keep_xobject(fz_context *ctx, pdf_xobject *xobj) diff --git a/pdf/pdf_xref.c b/pdf/pdf_xref.c index 332ddaf0..92ce8583 100644 --- a/pdf/pdf_xref.c +++ b/pdf/pdf_xref.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" static inline int iswhite(int ch) { diff --git a/pdf/pdf_xref_aux.c b/pdf/pdf_xref_aux.c index c34a86ed..4a847cbe 100644 --- a/pdf/pdf_xref_aux.c +++ b/pdf/pdf_xref_aux.c @@ -1,5 +1,5 @@ -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" /* These functions have been split out of pdf_xref.c to allow tools diff --git a/scripts/cmapdump.c b/scripts/cmapdump.c index d8671eb2..caaa3efa 100644 --- a/scripts/cmapdump.c +++ b/scripts/cmapdump.c @@ -6,8 +6,8 @@ /* We never want to build memento versions of the cmapdump util */ #undef MEMENTO -#include "fitz-internal.h" -#include "mupdf-internal.h" +#include "mupdf/fitz-internal.h" +#include "mupdf/pdf-internal.h" #include "../fitz/base_context.c" #include "../fitz/base_error.c" diff --git a/xps/xps_common.c b/xps/xps_common.c index f3a9ed54..e0917f6b 100644 --- a/xps/xps_common.c +++ b/xps/xps_common.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" static inline int unhex(int a) { diff --git a/xps/xps_doc.c b/xps/xps_doc.c index 178f2d6b..4f6c38db 100644 --- a/xps/xps_doc.c +++ b/xps/xps_doc.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" #define REL_START_PART \ "http://schemas.microsoft.com/xps/2005/06/fixedrepresentation" diff --git a/xps/xps_glyphs.c b/xps/xps_glyphs.c index 76015fb7..2e5be59f 100644 --- a/xps/xps_glyphs.c +++ b/xps/xps_glyphs.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" #include <ft2build.h> #include FT_FREETYPE_H diff --git a/xps/xps_gradient.c b/xps/xps_gradient.c index 17178f84..6b2a5780 100644 --- a/xps/xps_gradient.c +++ b/xps/xps_gradient.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" #define MAX_STOPS 256 diff --git a/xps/xps_image.c b/xps/xps_image.c index f0406c5b..ab3cda53 100644 --- a/xps/xps_image.c +++ b/xps/xps_image.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" static fz_image * xps_load_image(fz_context *ctx, xps_part *part) diff --git a/xps/xps_outline.c b/xps/xps_outline.c index 4e2a2620..608e66f5 100644 --- a/xps/xps_outline.c +++ b/xps/xps_outline.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" /* * Parse the document structure / outline parts referenced from fixdoc relationships. diff --git a/xps/xps_path.c b/xps/xps_path.c index 3236971f..24f10e78 100644 --- a/xps/xps_path.c +++ b/xps/xps_path.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" static char * xps_parse_float_array(char *s, int num, float *x) diff --git a/xps/xps_resource.c b/xps/xps_resource.c index 3c0f8848..c91e0abc 100644 --- a/xps/xps_resource.c +++ b/xps/xps_resource.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" static fz_xml * xps_lookup_resource(xps_document *doc, xps_resource *dict, char *name, char **urip) diff --git a/xps/xps_tile.c b/xps/xps_tile.c index e508719d..bebd94aa 100644 --- a/xps/xps_tile.c +++ b/xps/xps_tile.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" #define TILE diff --git a/xps/xps_util.c b/xps/xps_util.c index 167171cc..97886820 100644 --- a/xps/xps_util.c +++ b/xps/xps_util.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" static inline int xps_tolower(int c) { diff --git a/xps/xps_zip.c b/xps/xps_zip.c index 007887cb..b0a44914 100644 --- a/xps/xps_zip.c +++ b/xps/xps_zip.c @@ -1,4 +1,4 @@ -#include "muxps-internal.h" +#include "mupdf/xps-internal.h" #include <zlib.h> |