diff options
| -rw-r--r-- | include/mupdf/pdf/object.h | 6 | ||||
| -rw-r--r-- | source/pdf/pdf-annot.c | 4 | ||||
| -rw-r--r-- | source/pdf/pdf-form.c | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-js.c | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-outline.c | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-parse.c | 8 | ||||
| -rw-r--r-- | source/pdf/pdf-xref.c | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/include/mupdf/pdf/object.h b/include/mupdf/pdf/object.h index bf574551..741ef09d 100644 --- a/include/mupdf/pdf/object.h +++ b/include/mupdf/pdf/object.h @@ -136,10 +136,10 @@ int pdf_obj_parent_num(fz_context *ctx, pdf_obj *obj); int pdf_sprint_obj(fz_context *ctx, char *s, int n, pdf_obj *obj, int tight); int pdf_print_obj(fz_context *ctx, fz_output *out, pdf_obj *obj, int tight); -char *pdf_to_utf8(fz_context *ctx, pdf_document *doc, pdf_obj *src); -unsigned short *pdf_to_ucs2(fz_context *ctx, pdf_document *doc, pdf_obj *src); +char *pdf_to_utf8(fz_context *ctx, pdf_obj *src); +unsigned short *pdf_to_ucs2(fz_context *ctx, pdf_obj *src); pdf_obj *pdf_to_utf8_name(fz_context *ctx, pdf_document *doc, pdf_obj *src); -char *pdf_from_ucs2(fz_context *ctx, pdf_document *doc, unsigned short *str); +char *pdf_from_ucs2(fz_context *ctx, unsigned short *str); void pdf_to_ucs2_buf(fz_context *ctx, unsigned short *buffer, pdf_obj *src); fz_rect *pdf_to_rect(fz_context *ctx, pdf_obj *array, fz_rect *rect); diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c index f14cd79c..d3b294d3 100644 --- a/source/pdf/pdf-annot.c +++ b/source/pdf/pdf-annot.c @@ -242,7 +242,7 @@ pdf_parse_file_spec(fz_context *ctx, pdf_document *doc, pdf_obj *file_spec) return NULL; } - path = pdf_to_utf8(ctx, doc, filename); + path = pdf_to_utf8(ctx, filename); #if defined(_WIN32) || defined(_WIN64) if (strcmp(pdf_to_name(ctx, pdf_dict_gets(ctx, file_spec, "FS")), "URL") != 0) { @@ -284,7 +284,7 @@ pdf_parse_action(fz_context *ctx, pdf_document *doc, pdf_obj *action) { ld.kind = FZ_LINK_URI; ld.ld.uri.is_map = pdf_to_bool(ctx, pdf_dict_get(ctx, action, PDF_NAME_IsMap)); - ld.ld.uri.uri = pdf_to_utf8(ctx, doc, pdf_dict_get(ctx, action, PDF_NAME_URI)); + ld.ld.uri.uri = pdf_to_utf8(ctx, pdf_dict_get(ctx, action, PDF_NAME_URI)); } else if (pdf_name_eq(ctx, PDF_NAME_Launch, obj)) { diff --git a/source/pdf/pdf-form.c b/source/pdf/pdf-form.c index 9dc40f30..dfaefe98 100644 --- a/source/pdf/pdf-form.c +++ b/source/pdf/pdf-form.c @@ -340,7 +340,7 @@ static void execute_action(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf pdf_obj *js = pdf_dict_get(ctx, a, PDF_NAME_JS); if (js) { - char *code = pdf_to_utf8(ctx, doc, js); + char *code = pdf_to_utf8(ctx, js); fz_try(ctx) { pdf_js_execute(doc->js, code); diff --git a/source/pdf/pdf-js.c b/source/pdf/pdf-js.c index c3e148fe..bc74eedc 100644 --- a/source/pdf/pdf-js.c +++ b/source/pdf/pdf-js.c @@ -646,7 +646,7 @@ static void pdf_js_load_document_level(pdf_js *js) { pdf_obj *fragment = pdf_dict_get_val(ctx, javascript, i); pdf_obj *code = pdf_dict_get(ctx, fragment, PDF_NAME_JS); - char *codebuf = pdf_to_utf8(ctx, doc, code); + char *codebuf = pdf_to_utf8(ctx, code); pdf_js_execute(js, codebuf); fz_free(ctx, codebuf); } diff --git a/source/pdf/pdf-outline.c b/source/pdf/pdf-outline.c index 0c1d3feb..c9fd35fe 100644 --- a/source/pdf/pdf-outline.c +++ b/source/pdf/pdf-outline.c @@ -24,7 +24,7 @@ pdf_load_outline_imp(fz_context *ctx, pdf_document *doc, pdf_obj *dict) obj = pdf_dict_get(ctx, dict, PDF_NAME_Title); if (obj) - node->title = pdf_to_utf8(ctx, doc, obj); + node->title = pdf_to_utf8(ctx, obj); if ((obj = pdf_dict_get(ctx, dict, PDF_NAME_Dest)) != NULL) node->dest = pdf_parse_link_dest(ctx, doc, FZ_LINK_GOTO, obj); diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c index 5ac9ba4c..74990ead 100644 --- a/source/pdf/pdf-parse.c +++ b/source/pdf/pdf-parse.c @@ -57,7 +57,7 @@ rune_from_utf16be(int *out, unsigned char *s, unsigned char *end) /* Convert Unicode/PdfDocEncoding string into utf-8 */ char * -pdf_to_utf8(fz_context *ctx, pdf_document *doc, pdf_obj *src) +pdf_to_utf8(fz_context *ctx, pdf_obj *src) { fz_buffer *stmbuf = NULL; unsigned char *srcptr; @@ -167,7 +167,7 @@ pdf_to_utf8(fz_context *ctx, pdf_document *doc, pdf_obj *src) /* Convert Unicode/PdfDocEncoding string into ucs-2 */ unsigned short * -pdf_to_ucs2(fz_context *ctx, pdf_document *doc, pdf_obj *src) +pdf_to_ucs2(fz_context *ctx, pdf_obj *src) { unsigned char *srcptr = (unsigned char *) pdf_to_str_buf(ctx, src); unsigned short *dstptr, *dst; @@ -228,7 +228,7 @@ pdf_to_ucs2_buf(fz_context *ctx, unsigned short *buffer, pdf_obj *src) /* Convert UCS-2 string into PdfDocEncoding for authentication */ char * -pdf_from_ucs2(fz_context *ctx, pdf_document *doc, unsigned short *src) +pdf_from_ucs2(fz_context *ctx, unsigned short *src) { int i, j, len; char *docstr; @@ -268,7 +268,7 @@ pdf_from_ucs2(fz_context *ctx, pdf_document *doc, unsigned short *src) pdf_obj * pdf_to_utf8_name(fz_context *ctx, pdf_document *doc, pdf_obj *src) { - char *buf = pdf_to_utf8(ctx, doc, src); + char *buf = pdf_to_utf8(ctx, src); pdf_obj *dst = pdf_new_name(ctx, doc, buf); fz_free(ctx, buf); return dst; diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c index af2fec33..87616f40 100644 --- a/source/pdf/pdf-xref.c +++ b/source/pdf/pdf-xref.c @@ -2325,7 +2325,7 @@ pdf_lookup_metadata(fz_context *ctx, pdf_document *doc, const char *key, char *b if (!info) return -1; - s = pdf_to_utf8(ctx, doc, info); + s = pdf_to_utf8(ctx, info); n = (int)fz_strlcpy(buf, s, size); fz_free(ctx, s); return n; |