diff options
Diffstat (limited to 'pdf')
38 files changed, 46 insertions, 82 deletions
diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c index d32a276b..4ed14abf 100644 --- a/pdf/pdf_annot.c +++ b/pdf/pdf_annot.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" #define SMALL_FLOAT (0.00001) diff --git a/pdf/pdf_cmap.c b/pdf/pdf_cmap.c index 100a8a3f..c006c6bb 100644 --- a/pdf/pdf_cmap.c +++ b/pdf/pdf_cmap.c @@ -15,8 +15,7 @@ * or can trust the parser to give us optimal mappings. */ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 b3374ab2..340f914b 100644 --- a/pdf/pdf_cmap_load.c +++ b/pdf/pdf_cmap_load.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 435fcd44..85b89939 100644 --- a/pdf/pdf_cmap_parse.c +++ b/pdf/pdf_cmap_parse.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* * CMap parser diff --git a/pdf/pdf_cmap_table.c b/pdf/pdf_cmap_table.c index 8c4d0b26..d3c567d7 100644 --- a/pdf/pdf_cmap_table.c +++ b/pdf/pdf_cmap_table.c @@ -1,11 +1,10 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" #ifndef NOCJK -#include "../generated/cmap_cns.h" -#include "../generated/cmap_gb.h" -#include "../generated/cmap_japan.h" -#include "../generated/cmap_korea.h" +#include "cmap_cns.h" +#include "cmap_gb.h" +#include "cmap_japan.h" +#include "cmap_korea.h" #endif static const struct { char *name; pdf_cmap *cmap; } cmap_table[] = diff --git a/pdf/pdf_colorspace.c b/pdf/pdf_colorspace.c index 1894e284..fc1ff541 100644 --- a/pdf/pdf_colorspace.c +++ b/pdf/pdf_colorspace.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* ICCBased */ diff --git a/pdf/pdf_crypt.c b/pdf/pdf_crypt.c index 8cfa59e4..9ffce0e1 100644 --- a/pdf/pdf_crypt.c +++ b/pdf/pdf_crypt.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" enum { diff --git a/pdf/pdf_device.c b/pdf/pdf_device.c index 56d4ef86..ecd3cd3f 100644 --- a/pdf/pdf_device.c +++ b/pdf/pdf_device.c @@ -1,4 +1,4 @@ -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" typedef struct pdf_device_s pdf_device; diff --git a/pdf/pdf_encoding.c b/pdf/pdf_encoding.c index 51956a6c..bc06dcee 100644 --- a/pdf/pdf_encoding.c +++ b/pdf/pdf_encoding.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" #include "data_encodings.h" #include "data_glyphlist.h" diff --git a/pdf/pdf_event.c b/pdf/pdf_event.c index 3ece04e8..dc908985 100644 --- a/pdf/pdf_event.c +++ b/pdf/pdf_event.c @@ -1,5 +1,5 @@ #include "mupdf/fitz.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" typedef struct { diff --git a/pdf/pdf_field.c b/pdf/pdf_field.c index 8c08828d..d8e1a240 100644 --- a/pdf/pdf_field.c +++ b/pdf/pdf_field.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 84c56c47..65589c94 100644 --- a/pdf/pdf_font.c +++ b/pdf/pdf_font.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" #include <ft2build.h> #include FT_FREETYPE_H diff --git a/pdf/pdf_fontfile.c b/pdf/pdf_fontfile.c index 8decb50f..5e8ad478 100644 --- a/pdf/pdf_fontfile.c +++ b/pdf/pdf_fontfile.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* Which fonts are embedded is based on a few preprocessor definitions. @@ -19,17 +18,17 @@ #define NOCJKFONT #endif -#include "../generated/font_base14.h" +#include "font_base14.h" #ifndef NODROIDFONT -#include "../generated/font_droid.h" +#include "font_droid.h" #endif #ifndef NOCJKFONT #ifndef NOCJKFULL -#include "../generated/font_cjk_full.h" +#include "font_cjk_full.h" #else -#include "../generated/font_cjk.h" +#include "font_cjk.h" #endif #endif diff --git a/pdf/pdf_form.c b/pdf/pdf_form.c index 45242b92..9b58c07b 100644 --- a/pdf/pdf_form.c +++ b/pdf/pdf_form.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" #define MATRIX_COEFS (6) diff --git a/pdf/pdf_function.c b/pdf/pdf_function.c index 172d0760..368c1415 100644 --- a/pdf/pdf_function.c +++ b/pdf/pdf_function.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" typedef struct psobj_s psobj; diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c index ee5be441..a75e6a73 100644 --- a/pdf/pdf_image.c +++ b/pdf/pdf_image.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 fc6b7b6d..ab883021 100644 --- a/pdf/pdf_interpret.c +++ b/pdf/pdf_interpret.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" #define TILE diff --git a/pdf/pdf_js.c b/pdf/pdf_js.c index ec0570f1..c5caffc7 100644 --- a/pdf/pdf_js.c +++ b/pdf/pdf_js.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" struct pdf_js_s { diff --git a/pdf/pdf_js_none.c b/pdf/pdf_js_none.c index dc0124bc..00cc5b54 100644 --- a/pdf/pdf_js_none.c +++ b/pdf/pdf_js_none.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" pdf_js *pdf_new_js(pdf_document *doc) { diff --git a/pdf/pdf_jsimp_cpp.c b/pdf/pdf_jsimp_cpp.c index ac815639..10fd835b 100644 --- a/pdf/pdf_jsimp_cpp.c +++ b/pdf/pdf_jsimp_cpp.c @@ -2,8 +2,7 @@ * in C++, from which calls to fz_throw aren't safe. The C++ versions * return errors explicitly, and these wrappers then throw them. */ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 f23c00d4..a8bf9f4b 100644 --- a/pdf/pdf_lex.c +++ b/pdf/pdf_lex.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 06161d60..8a4b7d11 100644 --- a/pdf/pdf_metrics.c +++ b/pdf/pdf_metrics.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 6d83ae41..ea386dda 100644 --- a/pdf/pdf_nametree.c +++ b/pdf/pdf_nametree.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 3eefede1..ac1609cf 100644 --- a/pdf/pdf_object.c +++ b/pdf/pdf_object.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" typedef enum pdf_objkind_e { diff --git a/pdf/pdf_outline.c b/pdf/pdf_outline.c index cbfdb230..584d60ea 100644 --- a/pdf/pdf_outline.c +++ b/pdf/pdf_outline.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 c4cdbf6b..df75ff51 100644 --- a/pdf/pdf_page.c +++ b/pdf/pdf_page.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" struct info { diff --git a/pdf/pdf_parse.c b/pdf/pdf_parse.c index d7648e2a..b50e1094 100644 --- a/pdf/pdf_parse.c +++ b/pdf/pdf_parse.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 d388f5d7..15d0b942 100644 --- a/pdf/pdf_pattern.c +++ b/pdf/pdf_pattern.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 398edf94..e482ec3a 100644 --- a/pdf/pdf_repair.c +++ b/pdf/pdf_repair.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* Scan file for objects and reconstruct xref table */ diff --git a/pdf/pdf_shade.c b/pdf/pdf_shade.c index f8004cfb..04c50b03 100644 --- a/pdf/pdf_shade.c +++ b/pdf/pdf_shade.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 9fb7777d..d3873e76 100644 --- a/pdf/pdf_store.c +++ b/pdf/pdf_store.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 37f04b02..7c1f4a6c 100644 --- a/pdf/pdf_stream.c +++ b/pdf/pdf_stream.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* * Check if an object is a stream or not. diff --git a/pdf/pdf_type3.c b/pdf/pdf_type3.c index 95ce8b79..bb952ff7 100644 --- a/pdf/pdf_type3.c +++ b/pdf/pdf_type3.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 ba7dad44..694cbac6 100644 --- a/pdf/pdf_unicode.c +++ b/pdf/pdf_unicode.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* Load or synthesize ToUnicode map for fonts */ diff --git a/pdf/pdf_write.c b/pdf/pdf_write.c index c76fdee3..9ca4607e 100644 --- a/pdf/pdf_write.c +++ b/pdf/pdf_write.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* #define DEBUG_LINEARIZATION */ /* #define DEBUG_HEAP_SORT */ diff --git a/pdf/pdf_xobject.c b/pdf/pdf_xobject.c index ff751fe0..a47ea687 100644 --- a/pdf/pdf_xobject.c +++ b/pdf/pdf_xobject.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.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 92ce8583..9b3d6653 100644 --- a/pdf/pdf_xref.c +++ b/pdf/pdf_xref.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" static inline int iswhite(int ch) { diff --git a/pdf/pdf_xref_aux.c b/pdf/pdf_xref_aux.c index 4a847cbe..48634374 100644 --- a/pdf/pdf_xref_aux.c +++ b/pdf/pdf_xref_aux.c @@ -1,5 +1,4 @@ -#include "mupdf/fitz-internal.h" -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" /* These functions have been split out of pdf_xref.c to allow tools |