fenix
/
cpdf-source
mirror of https://github.com/johnwhitington/cpdf-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-instated octal escape sequences when -raw is used for -set-title etc.

This commit is contained in:
John Whitington 2014-01-14 13:35:20 +00:00
parent bda4cfbb79
commit 0dd958c95b
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpdf.ml
View File

@ -881,6 +881,7 @@ let set_viewer_preference (key, value, version) pdf =
(* \section{Set an entry in the /Info dictionary} *) (* \section{Set an entry in the /Info dictionary} *)
let set_pdf_info (key, value, version) pdf = let set_pdf_info (key, value, version) pdf =
Printf.printf "set_pdf_info: %s %s\n" key (Pdfwrite.string_of_pdf value);
let infodict = let infodict =
match Pdf.lookup_direct pdf "/Info" pdf.Pdf.trailerdict with match Pdf.lookup_direct pdf "/Info" pdf.Pdf.trailerdict with
| Some d -> d | Some d -> d

14
cpdfcommand.ml
View File

@ -2684,6 +2684,17 @@ let addrectangle (w, h) color position relative_to_cropbox underneath range pdf
in in
Cpdf.process_pages addrectangle_page pdf range Cpdf.process_pages addrectangle_page pdf range
let rec unescape_octals prev = function
| [] -> rev prev
| '\\'::('0'..'9' as a)::('0'..'9' as b)::('0'..'9' as c)::t ->
let chr = char_of_int (int_of_string ("0o" ^ implode [a;b;c])) in
unescape_octals (chr::prev) t
| '\\'::'\\'::t -> unescape_octals ('\\'::prev) t
| h::t -> unescape_octals (h::prev) t
let unescape_octals s =
implode (unescape_octals [] (explode s))
(* Main function *) (* Main function *)
let go () = let go () =
match args.op with match args.op with
@ -2965,8 +2976,9 @@ let go () =
| Some ((SetAuthor _ | SetTitle _ | SetSubject _ | SetKeywords _ | Some ((SetAuthor _ | SetTitle _ | SetSubject _ | SetKeywords _
| SetCreate _ | SetModify _ | SetCreator _ | SetProducer _ | SetCreate _ | SetModify _ | SetCreator _ | SetProducer _
| SetTrapped | SetUntrapped) as op) -> | SetTrapped | SetUntrapped) as op) ->
flprint "a set operation\n";
let key, value, version = let key, value, version =
let f s = if args.encoding <> Cpdf.Raw then Pdftext.pdfdocstring_of_utf8 s else s in let f s = if args.encoding <> Cpdf.Raw then Pdftext.pdfdocstring_of_utf8 s else unescape_octals s in
match op with match op with
| SetAuthor s -> "/Author", Pdf.String (f s), 0 | SetAuthor s -> "/Author", Pdf.String (f s), 0
| SetTitle s -> "/Title", Pdf.String (f s), 1 | SetTitle s -> "/Title", Pdf.String (f s), 1