diff options
| author | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-01 15:10:40 +0100 |
|---|---|---|
| committer | Paul Gardiner <paulg.artifex@glidos.net> | 2012-08-01 15:10:40 +0100 |
| commit | c8b8bbc851ae2089f515b5e65780198ad024c5cb (patch) | |
| tree | b1702dda67a2a6026e8870ec1a89d70545f69f2f /pdf/mupdf-internal.h | |
| parent | 55743b7682129deb6cc03e90ebde1b0e6e62d3b4 (diff) | |
| parent | 4d36e9613da5190aba2c0c6c8281e5d35cf9758c (diff) | |
| download | mupdf-c8b8bbc851ae2089f515b5e65780198ad024c5cb.tar.xz | |
Merge branch 'master' into forms
Conflicts:
pdf/mupdf-internal.h
pdf/pdf_font.c
Diffstat (limited to 'pdf/mupdf-internal.h')
| -rw-r--r-- | pdf/mupdf-internal.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pdf/mupdf-internal.h b/pdf/mupdf-internal.h index eb423abb..62747538 100644 --- a/pdf/mupdf-internal.h +++ b/pdf/mupdf-internal.h @@ -245,10 +245,11 @@ fz_stream *pdf_open_raw_renumbered_stream(pdf_document *doc, int num, int gen, i void pdf_repair_xref(pdf_document *doc, pdf_lexbuf *buf); void pdf_repair_obj_stms(pdf_document *doc); -void pdf_print_xref(pdf_document *); void pdf_resize_xref(pdf_document *doc, int newcap); pdf_obj *pdf_new_ref(pdf_document *doc, pdf_obj *obj); +void pdf_print_xref(pdf_document *); + /* * Encryption */ @@ -266,7 +267,9 @@ char *pdf_crypt_method(pdf_document *doc); int pdf_crypt_length(pdf_document *doc); unsigned char *pdf_crypt_key(pdf_document *doc); +#ifndef NDEBUG void pdf_print_crypt(pdf_crypt *crypt); +#endif /* * Functions, Colorspaces, Shadings and Images @@ -274,7 +277,7 @@ void pdf_print_crypt(pdf_crypt *crypt); typedef struct pdf_function_s pdf_function; -pdf_function *pdf_load_function(pdf_document *doc, pdf_obj *ref); +pdf_function *pdf_load_function(pdf_document *doc, pdf_obj *ref, int in, int out); void pdf_eval_function(fz_context *ctx, pdf_function *func, float *in, int inlen, float *out, int outlen); pdf_function *pdf_keep_function(fz_context *ctx, pdf_function *func); void pdf_drop_function(fz_context *ctx, pdf_function *func); @@ -388,7 +391,6 @@ void pdf_drop_cmap(fz_context *ctx, pdf_cmap *cmap); void pdf_free_cmap_imp(fz_context *ctx, fz_storable *cmap); unsigned int pdf_cmap_size(fz_context *ctx, pdf_cmap *cmap); -void pdf_print_cmap(fz_context *ctx, pdf_cmap *cmap); int pdf_cmap_wmode(fz_context *ctx, pdf_cmap *cmap); void pdf_set_cmap_wmode(fz_context *ctx, pdf_cmap *cmap, int wmode); void pdf_set_usecmap(fz_context *ctx, pdf_cmap *cmap, pdf_cmap *usecmap); @@ -409,6 +411,10 @@ pdf_cmap *pdf_load_system_cmap(fz_context *ctx, char *name); pdf_cmap *pdf_load_builtin_cmap(fz_context *ctx, char *name); pdf_cmap *pdf_load_embedded_cmap(pdf_document *doc, pdf_obj *ref); +#ifndef NDEBUG +void pdf_print_cmap(fz_context *ctx, pdf_cmap *cmap); +#endif + /* * Font */ @@ -524,7 +530,10 @@ pdf_font_desc *pdf_new_font_desc(fz_context *ctx); pdf_font_desc *pdf_keep_font(fz_context *ctx, pdf_font_desc *fontdesc); void pdf_drop_font(fz_context *ctx, pdf_font_desc *font); +#ifndef NDEBUG void pdf_print_font(fz_context *ctx, pdf_font_desc *fontdesc); +#endif + fz_rect pdf_measure_text(fz_context *ctx, pdf_font_desc *fontdesc, unsigned char *buf, int len); float pdf_text_stride(fz_context *ctx, pdf_font_desc *fontdesc, float fontsize, unsigned char *buf, int len, float room, int *count); |