diff options
author | Paul Gardiner <paul@glidos.net> | 2012-07-18 14:45:28 +0100 |
---|---|---|
committer | Paul Gardiner <paul@glidos.net> | 2012-07-18 16:42:02 +0100 |
commit | 7eb8e51b6b889fa14aae39d282675b838aa43dc9 (patch) | |
tree | 4bf26eacd64612cbe2626263fb3ca344b53ef04e /pdf/pdf_annot.c | |
parent | b03aad16426b89728c00e8e9888de7866dde03cc (diff) | |
download | mupdf-7eb8e51b6b889fa14aae39d282675b838aa43dc9.tar.xz |
Update pdf_to_utf8 to handle either a stream or a string
Also change first argument from fz_context to pdf_document in each
of pdf_to_utf8, pdf_to_utf8_name, pdf_to_ucs2 and pdf_to_ucs2_name
Diffstat (limited to 'pdf/pdf_annot.c')
-rw-r--r-- | pdf/pdf_annot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pdf/pdf_annot.c b/pdf/pdf_annot.c index dc31498c..fc436409 100644 --- a/pdf/pdf_annot.c +++ b/pdf/pdf_annot.c @@ -213,7 +213,7 @@ pdf_parse_action(pdf_document *xref, pdf_obj *action) { ld.kind = FZ_LINK_URI; ld.ld.uri.is_map = pdf_to_bool(pdf_dict_gets(action, "IsMap")); - ld.ld.uri.uri = pdf_to_utf8(ctx, pdf_dict_gets(action, "URI")); + ld.ld.uri.uri = pdf_to_utf8(xref, pdf_dict_gets(action, "URI")); } else if (!strcmp(pdf_to_name(obj), "Launch")) { @@ -221,20 +221,20 @@ pdf_parse_action(pdf_document *xref, pdf_obj *action) ld.kind = FZ_LINK_LAUNCH; if (pdf_is_dict(dest)) dest = pdf_dict_gets(dest, "F"); - ld.ld.launch.file_spec = pdf_to_utf8(ctx, dest); + ld.ld.launch.file_spec = pdf_to_utf8(xref, dest); ld.ld.launch.new_window = pdf_to_int(pdf_dict_gets(action, "NewWindow")); } else if (!strcmp(pdf_to_name(obj), "Named")) { ld.kind = FZ_LINK_NAMED; - ld.ld.named.named = pdf_to_utf8(ctx, pdf_dict_gets(action, "N")); + ld.ld.named.named = pdf_to_utf8(xref, pdf_dict_gets(action, "N")); } else if (!strcmp(pdf_to_name(obj), "GoToR")) { dest = pdf_dict_gets(action, "D"); ld = pdf_parse_link_dest(xref, dest); ld.kind = FZ_LINK_GOTOR; - ld.ld.gotor.file_spec = pdf_to_utf8(ctx, pdf_dict_gets(action, "F")); + ld.ld.gotor.file_spec = pdf_to_utf8(xref, pdf_dict_gets(action, "F")); ld.ld.gotor.new_window = pdf_to_int(pdf_dict_gets(action, "NewWindow")); } return ld; |