diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2013-06-17 16:34:58 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2013-06-18 17:37:13 +0200 |
commit | 8856f8521a42872a95579666b24ecfb65c5a20a1 (patch) | |
tree | eab5136996379f77d52699c25f8855ea36d06cc2 /fitz | |
parent | 03e5755b93e90cc4c09daad4c79b6016bf4ce43c (diff) | |
download | mupdf-8856f8521a42872a95579666b24ecfb65c5a20a1.tar.xz |
Merge common and internal headers into one.
Diffstat (limited to 'fitz')
55 files changed, 55 insertions, 55 deletions
diff --git a/fitz/base_context.c b/fitz/base_context.c index 93e4fe92..bf61e27d 100644 --- a/fitz/base_context.c +++ b/fitz/base_context.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" struct fz_id_context_s { diff --git a/fitz/base_error.c b/fitz/base_error.c index d9ad770b..31d285fe 100644 --- a/fitz/base_error.c +++ b/fitz/base_error.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* Warning context */ diff --git a/fitz/base_geometry.c b/fitz/base_geometry.c index f5e7cc91..81450246 100644 --- a/fitz/base_geometry.c +++ b/fitz/base_geometry.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 b66a7a87..e6ed019b 100644 --- a/fitz/base_hash.c +++ b/fitz/base_hash.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* Simple hashtable with open addressing linear probe. diff --git a/fitz/base_memory.c b/fitz/base_memory.c index 91881e45..dc1d0df0 100644 --- a/fitz/base_memory.c +++ b/fitz/base_memory.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 d584b570..b29cdbdc 100644 --- a/fitz/base_string.c +++ b/fitz/base_string.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" char * fz_strsep(char **stringp, const char *delim) diff --git a/fitz/base_trans.c b/fitz/base_trans.c index 81a08735..92582253 100644 --- a/fitz/base_trans.c +++ b/fitz/base_trans.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" static int fade(fz_pixmap *tpix, fz_pixmap *opix, fz_pixmap *npix, int time) diff --git a/fitz/crypt_aes.c b/fitz/crypt_aes.c index eb5d260f..6ce14903 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 "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #define aes_context fz_aes diff --git a/fitz/crypt_arc4.c b/fitz/crypt_arc4.c index 1f15dd25..9c54fbae 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 "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 3c896379..7490c0bc 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 "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* Constants for MD5Transform routine */ enum diff --git a/fitz/crypt_pkcs7.c b/fitz/crypt_pkcs7.c index b4f63cb7..26389ae4 100644 --- a/fitz/crypt_pkcs7.c +++ b/fitz/crypt_pkcs7.c @@ -1,4 +1,4 @@ -#include "mupdf/pdf-internal.h" +#include "mupdf/pdf.h" // TODO: move this file to pdf module #ifdef HAVE_OPENSSL diff --git a/fitz/crypt_sha2.c b/fitz/crypt_sha2.c index 62df2506..ffedfc95 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 "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" static inline int isbigendian(void) { diff --git a/fitz/dev_bbox.c b/fitz/dev_bbox.c index d9077ed9..9cb2a27e 100644 --- a/fitz/dev_bbox.c +++ b/fitz/dev_bbox.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #define STACK_SIZE 96 diff --git a/fitz/dev_list.c b/fitz/dev_list.c index 5de71cc9..6ffe165f 100644 --- a/fitz/dev_list.c +++ b/fitz/dev_list.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" typedef struct fz_display_node_s fz_display_node; diff --git a/fitz/dev_null.c b/fitz/dev_null.c index 14bcc292..bf548d7f 100644 --- a/fitz/dev_null.c +++ b/fitz/dev_null.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" fz_device * fz_new_device(fz_context *ctx, void *user) diff --git a/fitz/dev_svg.c b/fitz/dev_svg.c index 99457d20..4dd82120 100644 --- a/fitz/dev_svg.c +++ b/fitz/dev_svg.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" typedef struct svg_device_s svg_device; diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c index e157e9cc..b3cade91 100644 --- a/fitz/dev_trace.c +++ b/fitz/dev_trace.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" static void fz_trace_matrix(const fz_matrix *ctm) diff --git a/fitz/doc_document.c b/fitz/doc_document.c index 673aba3f..8adbf816 100644 --- a/fitz/doc_document.c +++ b/fitz/doc_document.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 730d4110..30dca222 100644 --- a/fitz/doc_link.c +++ b/fitz/doc_link.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 d3604bdf..e26fd378 100644 --- a/fitz/doc_outline.c +++ b/fitz/doc_outline.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" void fz_free_outline(fz_context *ctx, fz_outline *outline) diff --git a/fitz/filt_basic.c b/fitz/filt_basic.c index 2446d41d..dcebd912 100644 --- a/fitz/filt_basic.c +++ b/fitz/filt_basic.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* Pretend we have a filter that just copies data forever */ diff --git a/fitz/filt_dctd.c b/fitz/filt_dctd.c index 196b7a73..0a50dfa3 100644 --- a/fitz/filt_dctd.c +++ b/fitz/filt_dctd.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #include <jpeglib.h> #include <setjmp.h> diff --git a/fitz/filt_faxd.c b/fitz/filt_faxd.c index 27accedb..fab66f1a 100644 --- a/fitz/filt_faxd.c +++ b/fitz/filt_faxd.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* Fax G3/G4 decoder */ diff --git a/fitz/filt_flate.c b/fitz/filt_flate.c index 155f6c78..ee7a83f9 100644 --- a/fitz/filt_flate.c +++ b/fitz/filt_flate.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #include <zlib.h> diff --git a/fitz/filt_jbig2d.c b/fitz/filt_jbig2d.c index 14683954..3cb0bcef 100644 --- a/fitz/filt_jbig2d.c +++ b/fitz/filt_jbig2d.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #include <jbig2.h> diff --git a/fitz/filt_lzwd.c b/fitz/filt_lzwd.c index 4f8b96b7..73909ca1 100644 --- a/fitz/filt_lzwd.c +++ b/fitz/filt_lzwd.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* TODO: error checking */ diff --git a/fitz/filt_predict.c b/fitz/filt_predict.c index 3387a66d..c8de290a 100644 --- a/fitz/filt_predict.c +++ b/fitz/filt_predict.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* TODO: check if this works with 16bpp images */ diff --git a/fitz/image_jpeg.c b/fitz/image_jpeg.c index 2ab83180..faca16ef 100644 --- a/fitz/image_jpeg.c +++ b/fitz/image_jpeg.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #include <jpeglib.h> diff --git a/fitz/image_jpx.c b/fitz/image_jpx.c index be7368f4..43a4d2ef 100644 --- a/fitz/image_jpx.c +++ b/fitz/image_jpx.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 3e479d69..aea290ec 100644 --- a/fitz/image_md5.c +++ b/fitz/image_md5.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 a86f4b56..1f48e298 100644 --- a/fitz/image_png.c +++ b/fitz/image_png.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #include <zlib.h> diff --git a/fitz/image_save.c b/fitz/image_save.c index b44323ab..0a564ed1 100644 --- a/fitz/image_save.c +++ b/fitz/image_save.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 1249927f..6a650bff 100644 --- a/fitz/image_tiff.c +++ b/fitz/image_tiff.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* * TIFF image loader. Should be enough to support TIFF files in XPS. diff --git a/fitz/res_bitmap.c b/fitz/res_bitmap.c index c31e85b4..ecdca8e5 100644 --- a/fitz/res_bitmap.c +++ b/fitz/res_bitmap.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 2486799d..e1533218 100644 --- a/fitz/res_colorspace.c +++ b/fitz/res_colorspace.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #define SLOWCMYK diff --git a/fitz/res_font.c b/fitz/res_font.c index 5f8721f6..aa3ace9b 100644 --- a/fitz/res_font.c +++ b/fitz/res_font.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #include <ft2build.h> #include FT_FREETYPE_H diff --git a/fitz/res_func.c b/fitz/res_func.c index 53f0d2c9..b5ba4815 100644 --- a/fitz/res_func.c +++ b/fitz/res_func.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 0472a8d9..15aebead 100644 --- a/fitz/res_halftone.c +++ b/fitz/res_halftone.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" fz_halftone * fz_new_halftone(fz_context *ctx, int comps) diff --git a/fitz/res_image.c b/fitz/res_image.c index 06d1f2f0..542ff40a 100644 --- a/fitz/res_image.c +++ b/fitz/res_image.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 142928b9..cbdfc7bc 100644 --- a/fitz/res_path.c +++ b/fitz/res_path.c @@ -1,5 +1,5 @@ #include <assert.h> -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" fz_path * fz_new_path(fz_context *ctx) diff --git a/fitz/res_pcl.c b/fitz/res_pcl.c index e456f401..d5b351d4 100644 --- a/fitz/res_pcl.c +++ b/fitz/res_pcl.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* Lifted from ghostscript gdevjlm.h */ /* diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c index c528a77d..4288d379 100644 --- a/fitz/res_pixmap.c +++ b/fitz/res_pixmap.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 0cdcc771..e9d1b626 100644 --- a/fitz/res_pwg.c +++ b/fitz/res_pwg.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" void fz_output_pwg_file_header(fz_output *out) diff --git a/fitz/res_shade.c b/fitz/res_shade.c index 0bbbeae3..676f375c 100644 --- a/fitz/res_shade.c +++ b/fitz/res_shade.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 5b25f197..609f10dc 100644 --- a/fitz/res_store.c +++ b/fitz/res_store.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" typedef struct fz_item_s fz_item; diff --git a/fitz/res_text.c b/fitz/res_text.c index 28142e2c..81e2e1d0 100644 --- a/fitz/res_text.c +++ b/fitz/res_text.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 40adff0c..388e0461 100644 --- a/fitz/stm_buffer.c +++ b/fitz/stm_buffer.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 77f7b741..acdf2747 100644 --- a/fitz/stm_comp_buf.c +++ b/fitz/stm_comp_buf.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 3b2eb53f..d82acf0a 100644 --- a/fitz/stm_open.c +++ b/fitz/stm_open.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" fz_stream * fz_new_stream(fz_context *ctx, void *state, diff --git a/fitz/stm_output.c b/fitz/stm_output.c index ff9e866b..f98b945e 100644 --- a/fitz/stm_output.c +++ b/fitz/stm_output.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.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 a0988f46..3ffb918f 100644 --- a/fitz/stm_read.c +++ b/fitz/stm_read.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #define MIN_BOMB (100 << 20) diff --git a/fitz/text_extract.c b/fitz/text_extract.c index cf32ae53..e3bf9d19 100644 --- a/fitz/text_extract.c +++ b/fitz/text_extract.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #include "ucdn.h" /* Extract text into an unsorted span soup. */ diff --git a/fitz/text_output.c b/fitz/text_output.c index b3af936f..d3241131 100644 --- a/fitz/text_output.c +++ b/fitz/text_output.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" #define SUBSCRIPT_OFFSET 0.2f #define SUPERSCRIPT_OFFSET -0.2f diff --git a/fitz/text_paragraph.c b/fitz/text_paragraph.c index df626f5e..51062938 100644 --- a/fitz/text_paragraph.c +++ b/fitz/text_paragraph.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" /* Assemble span soup into blocks and lines. */ diff --git a/fitz/text_search.c b/fitz/text_search.c index a90a682f..f1f0d203 100644 --- a/fitz/text_search.c +++ b/fitz/text_search.c @@ -1,4 +1,4 @@ -#include "mupdf/fitz-internal.h" +#include "mupdf/fitz.h" static inline int fz_tolower(int c) { |