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

Use new logger

This commit is contained in:
John Whitington 2023-04-25 13:45:56 +01:00
parent b17b08a3e1
commit c30c49e90e
13 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cpdfaddtext.ml
View File

@ -24,7 +24,7 @@ let charcodes_of_utf8 font s =
match extractor codepoint with match extractor codepoint with
| Some cc -> Some cc | Some cc -> Some cc
| None -> | None ->
Printf.eprintf "Warning: character not found in font for unicode codepoint 0x%X\n" codepoint; Pdfe.log (Printf.sprintf "Warning: character not found in font for unicode codepoint 0x%X\n" codepoint);
None) None)
codepoints codepoints
in in
@ -498,7 +498,7 @@ let
| Some (Pdftext.SimpleFont {fontdescriptor = Some {capheight}}) -> | Some (Pdftext.SimpleFont {fontdescriptor = Some {capheight}}) ->
voffset := !voffset +. capheight /. 2. voffset := !voffset +. capheight /. 2.
| _ -> | _ ->
Printf.eprintf "Unable to find midline adjustment in this font\n" Pdfe.log "Unable to find midline adjustment in this font\n"
end end
else else
if topline then if topline then
@ -511,7 +511,7 @@ let
| Some (Pdftext.SimpleFont {fontdescriptor = Some {capheight}}) -> | Some (Pdftext.SimpleFont {fontdescriptor = Some {capheight}}) ->
voffset := !voffset +. capheight voffset := !voffset +. capheight
| _ -> | _ ->
Printf.eprintf "Unable to find midline adjustment in this font\n" Pdfe.log "Unable to find midline adjustment in this font\n"
end; end;
let encoding = let encoding =
match font with match font with

4
cpdfannot.ml
View File

@ -75,7 +75,7 @@ let annotations_json_page calculate_pagenumber pdf page pagenum =
`Int objnum; `Int objnum;
Cpdfjson.json_of_object ~utf8:true ~clean_strings:true pdf (fun _ -> ()) Cpdfjson.json_of_object ~utf8:true ~clean_strings:true pdf (fun _ -> ())
~no_stream_data:false ~parse_content:false annot]) ~no_stream_data:false ~parse_content:false annot])
| _ -> Printf.eprintf "Warning: annotations must be indirect\n"; None | _ -> Pdfe.log "Warning: annotations must be indirect\n"; None
end) end)
annots annots
| _ -> [] | _ -> []
@ -93,7 +93,7 @@ let get_annotations_json pdf range =
let pages, pagenums = split pairs in let pages, pagenums = split pairs in
let json = flatten (map2 (annotations_json_page calculate_pagenumber pdf) pages pagenums) in let json = flatten (map2 (annotations_json_page calculate_pagenumber pdf) pages pagenums) in
(*Printf.printf "%i extra roots to explore\n" (length extra); (*Printf.printf "%i extra roots to explore\n" (length extra);
iter (fun x -> Printf.eprintf "%s\n\n" (Pdfwrite.string_of_pdf x)) extra;*) iter (fun x -> Pdfe.log "%s\n\n" (Pdfwrite.string_of_pdf x)) extra;*)
let extra = let extra =
map map
(fun n -> (fun n ->

4
cpdfattach.ml
View File

@ -169,7 +169,7 @@ let list_attached_files pdf =
| Some (Pdf.String s) -> | Some (Pdf.String s) ->
begin match Pdf.lookup_direct pdf "/FS" annot with begin match Pdf.lookup_direct pdf "/FS" annot with
| Some ((Pdf.Dictionary _) as d) -> | Some ((Pdf.Dictionary _) as d) ->
(*Printf.eprintf "%s\n%!" (Pdfwrite.string_of_pdf d);*) (*Pdfe.log (Printf.sprintf "%s\n" (Pdfwrite.string_of_pdf d));*)
begin match Pdf.lookup_direct pdf "/EF" d with begin match Pdf.lookup_direct pdf "/EF" d with
| Some ((Pdf.Dictionary _) as d) -> | Some ((Pdf.Dictionary _) as d) ->
begin match Pdf.lookup_direct pdf "/F" d with begin match Pdf.lookup_direct pdf "/F" d with
@ -264,7 +264,7 @@ let dump_attachment out pdf (_, embeddedfile) =
for x = 0 to bytes_size efdata - 1 do output_byte fh (bget efdata x) done; for x = 0 to bytes_size efdata - 1 do output_byte fh (bget efdata x) done;
close_out fh close_out fh
with with
e -> Printf.eprintf "Failed to write attachment to %s\n%!" filename; e -> Pdfe.log (Printf.sprintf "Failed to write attachment to %s\n" filename);
end end
| _ -> () | _ -> ()

107
cpdfcommand.ml
View File

@ -69,12 +69,11 @@ exception StayOnError
(* Fatal error reporting. *) (* Fatal error reporting. *)
let error s = let error s =
prerr_string (s ^ "\nUse -help for help.\n"); Pdfe.log (s ^ "\nUse -help for help.\n");
flush stderr;
if not !stay_on_error then exit 2 else raise StayOnError if not !stay_on_error then exit 2 else raise StayOnError
let soft_error s = let soft_error s =
Printf.eprintf "%s\n%!" s; Pdfe.log (Printf.sprintf "%s\n" s);
if not !stay_on_error then exit 1 else raise StayOnError if not !stay_on_error then exit 1 else raise StayOnError
let parse_pagespec pdf spec = let parse_pagespec pdf spec =
@ -757,14 +756,14 @@ let call_cpdflin cpdflin temp output best_password =
match Sys.os_type with match Sys.os_type with
"Win32" -> "Win32" ->
(* On windows, don't use LD_LIBRARY_PATH - it will happen automatically *) (* On windows, don't use LD_LIBRARY_PATH - it will happen automatically *)
if args.debug then prerr_endline command; if args.debug then Pdfe.log (command ^ "\n");
Sys.command command Sys.command command
| _ -> | _ ->
(* On other platforms, if -cpdflin was provided, or cpdflin was in the (* On other platforms, if -cpdflin was provided, or cpdflin was in the
current folder, set up LD_LIBRARY_PATH: *) current folder, set up LD_LIBRARY_PATH: *)
match cpdflin with match cpdflin with
"cpdflin" -> "cpdflin" ->
if args.debug then prerr_endline command; if args.debug then Pdfe.log (command ^ "\n");
Sys.command command Sys.command command
| _ -> | _ ->
let command = let command =
@ -772,7 +771,7 @@ let call_cpdflin cpdflin temp output best_password =
"LD_LIBRARY_PATH=" ^ Filename.quote (Filename.dirname cpdflin) ^ " " ^ "LD_LIBRARY_PATH=" ^ Filename.quote (Filename.dirname cpdflin) ^ " " ^
command command
in in
if args.debug then prerr_endline command; if args.debug then Pdfe.log (command ^ "\n");
Sys.command command Sys.command command
let get_pagespec () = let get_pagespec () =
@ -904,8 +903,8 @@ let detect_duplicate_op op =
match args.op with match args.op with
None | Some Shift -> () None | Some Shift -> ()
| _ -> | _ ->
Printf.eprintf "Operation %s already specified, so cannot specify operation %s.\nUse AND from Chapter 1 of the manual to chain commands together.\n%!" Pdfe.log (Printf.sprintf "Operation %s already specified, so cannot specify operation %s.\nUse AND from Chapter 1 of the manual to chain commands together.\n"
(string_of_op (unopt args.op)) (string_of_op op); (string_of_op (unopt args.op)) (string_of_op op));
exit 1 exit 1
let setop op () = let setop op () =
@ -986,7 +985,7 @@ let anon_fun s =
Not_found -> Not_found ->
match args.inputs with match args.inputs with
| [] -> | [] ->
Printf.eprintf "Warning: range '%s' ignored\n%!" s Pdfe.log (Printf.sprintf "Warning: range '%s' ignored\n" s)
| (a, _, d, e, f, g)::t -> | (a, _, d, e, f, g)::t ->
args.inputs <- (a, fixdashes s, d, e, f, g)::t args.inputs <- (a, fixdashes s, d, e, f, g)::t
@ -1485,7 +1484,7 @@ let setrevision n =
(a, b, c, d, e, _)::more -> (a, b, c, d, e, _)::more ->
args.inputs <- (a, b, c, d, e, Some n) :: more args.inputs <- (a, b, c, d, e, Some n) :: more
| [] -> | [] ->
Printf.eprintf "Warning. -revision ignored. Put it after the filename.\n%!" Pdfe.log "Warning. -revision ignored. Put it after the filename.\n"
let setoutline () = let setoutline () =
args.outline <- true args.outline <- true
@ -1769,7 +1768,7 @@ let setfontttfencoding s =
| _ -> error "Unknown encoding" | _ -> error "Unknown encoding"
let whingemalformed () = let whingemalformed () =
prerr_string "Command line must be of exactly the form\ncpdf <infile> -gs <path> -gs-malformed-force -o <outfile>\n"; Pdfe.log "Command line must be of exactly the form\ncpdf <infile> -gs <path> -gs-malformed-force -o <outfile>\n";
exit 1 exit 1
(* Drawing operations. FIXME: Clear this around ANDs? *) (* Drawing operations. FIXME: Clear this around ANDs? *)
@ -2045,6 +2044,9 @@ let set_input_png s =
let addimage s = let addimage s =
addop (Cpdfdraw.Image s) addop (Cpdfdraw.Image s)
let setstderrtostdout () =
Pdfe.logger := (fun s -> print_string s; flush stdout)
(* Parse a control file, make an argv, and then make Arg parse it. *) (* Parse a control file, make an argv, and then make Arg parse it. *)
let rec make_control_argv_and_parse filename = let rec make_control_argv_and_parse filename =
control_args := !control_args @ parse_control_file filename control_args := !control_args @ parse_control_file filename
@ -2881,6 +2883,7 @@ and specs =
("-debug-crypt", Arg.Unit setdebugcrypt, ""); ("-debug-crypt", Arg.Unit setdebugcrypt, "");
("-debug-force", Arg.Unit setdebugforce, ""); ("-debug-force", Arg.Unit setdebugforce, "");
("-debug-malformed", Arg.Set Pdfread.debug_always_treat_malformed, ""); ("-debug-malformed", Arg.Set Pdfread.debug_always_treat_malformed, "");
("-debug-stderr-to-stdout", Arg.Unit setstderrtostdout, "");
("-stay-on-error", Arg.Unit setstayonerror, ""); ("-stay-on-error", Arg.Unit setstayonerror, "");
(* These items are unfinished *) (* These items are unfinished *)
("-extract-fontfile", Arg.Unit (setop ExtractFontFile), ""); ("-extract-fontfile", Arg.Unit (setop ExtractFontFile), "");
@ -2911,21 +2914,22 @@ let filesize name =
(* Mend PDF file with Ghostscript. We use this if a file is malformed and CPDF (* Mend PDF file with Ghostscript. We use this if a file is malformed and CPDF
* cannot mend it. It is copied to a temporary file, fixed, then we return None or Some (pdf). *) * cannot mend it. It is copied to a temporary file, fixed, then we return None or Some (pdf). *)
let mend_pdf_file_with_ghostscript filename = let mend_pdf_file_with_ghostscript filename =
if args.path_to_ghostscript = "" then begin match args.path_to_ghostscript with
Printf.eprintf "Please supply path to gs with -gs\n%!"; | "" ->
end; Pdfe.log "Please supply path to gs with -gs\n";
Printf.eprintf "CPDF could not mend. Attempting to mend file with gs\n%!"; exit 2
flush stderr; | _ ->
let tmpout = Filename.temp_file "cpdf" ".pdf" in Pdfe.log "CPDF could not mend. Attempting to mend file with gs\n";
tempfiles := tmpout::!tempfiles; let tmpout = Filename.temp_file "cpdf" ".pdf" in
let gscall = tempfiles := tmpout::!tempfiles;
Filename.quote_command args.path_to_ghostscript let gscall =
((if args.gs_quiet then ["-dQUIET"] else []) @ Filename.quote_command args.path_to_ghostscript
["-dNOPAUSE"; "-sDEVICE=pdfwrite"; "-sOUTPUTFILE=" ^ tmpout; "-dBATCH"; filename]) ((if args.gs_quiet then ["-dQUIET"] else []) @
in ["-dNOPAUSE"; "-sDEVICE=pdfwrite"; "-sOUTPUTFILE=" ^ tmpout; "-dBATCH"; filename])
match Sys.command gscall with in
| 0 -> Printf.eprintf "Succeeded!\n%!"; flush stderr; tmpout match Sys.command gscall with
| _ -> Printf.eprintf "Could not fix malformed PDF file, even with gs\n%!"; flush stderr; exit 2 | 0 -> Pdfe.log "Succeeded!\n"; tmpout
| _ -> Pdfe.log "Could not fix malformed PDF file, even with gs\n"; exit 2
exception StdInBytes of bytes exception StdInBytes of bytes
@ -2951,7 +2955,7 @@ let rec get_single_pdf ?(decrypt=true) ?(fail=false) op read_lazy =
let failout () = let failout () =
if fail then begin if fail then begin
(* Reconstructed with ghostscript, but then we couldn't read it even then. Do not loop. *) (* Reconstructed with ghostscript, but then we couldn't read it even then. Do not loop. *)
Printf.eprintf "Failed to read gs-reconstructed PDF even though gs succeeded\n%!"; Pdfe.log "Failed to read gs-reconstructed PDF even though gs succeeded\n";
exit 2 exit 2
end end
in in
@ -2959,12 +2963,12 @@ let rec get_single_pdf ?(decrypt=true) ?(fail=false) op read_lazy =
begin match args.inputs with begin match args.inputs with
(InFile inname, _, _, _, _, _)::_ -> (InFile inname, _, _, _, _, _)::_ ->
begin try ignore (close_in (open_in_bin inname)) with _ -> begin try ignore (close_in (open_in_bin inname)) with _ ->
Printf.eprintf "File %s does not exist\n%!" inname; Pdfe.log (Printf.sprintf "File %s does not exist\n" inname);
exit 2 exit 2
end end
| _ -> () | _ -> ()
end; end;
Printf.eprintf "get_single_pdf: failed to read malformed PDF file. Consider using -gs-malformed\n%!"; Pdfe.log "get_single_pdf: failed to read malformed PDF file. Consider using -gs-malformed\n";
exit 2 exit 2
in in
match args.inputs with match args.inputs with
@ -3034,7 +3038,7 @@ let rec get_pdf_from_input_kind ?(read_lazy=false) ?(decrypt=true) ?(fail=false)
let failout () = let failout () =
if fail then begin if fail then begin
(* Reconstructed with ghostscript, but then we couldn't read it even then. Do not loop. *) (* Reconstructed with ghostscript, but then we couldn't read it even then. Do not loop. *)
Printf.eprintf "Failed to read gs-reconstructed PDF even though gs succeeded\n%!"; Pdfe.log "Failed to read gs-reconstructed PDF even though gs succeeded\n";
exit 2 exit 2
end end
in in
@ -3042,12 +3046,12 @@ let rec get_pdf_from_input_kind ?(read_lazy=false) ?(decrypt=true) ?(fail=false)
begin match input with begin match input with
(InFile inname, _, _, _, _, _) -> (InFile inname, _, _, _, _, _) ->
begin try ignore (close_in (open_in_bin inname)) with _ -> begin try ignore (close_in (open_in_bin inname)) with _ ->
Printf.eprintf "File %s does not exist\n%!" inname; Pdfe.log (Printf.sprintf "File %s does not exist\n" inname);
exit 2 exit 2
end end
| _ -> () | _ -> ()
end; end;
Printf.eprintf "get_pdf_from_input_kind: failed to read malformed PDF file. Consider using -gs-malformed\n%!"; Pdfe.log "get_pdf_from_input_kind: failed to read malformed PDF file. Consider using -gs-malformed\n";
exit 2 exit 2
in in
match ik with match ik with
@ -3138,7 +3142,7 @@ let really_write_pdf ?(encryption = None) ?(is_decompress=false) mk_id pdf outna
then then
set_producer "cpdf non-commercial use only. To buy: http://coherentpdf.com/" pdf; set_producer "cpdf non-commercial use only. To buy: http://coherentpdf.com/" pdf;
if args.creator <> None then set_creator (unopt args.creator) pdf; if args.creator <> None then set_creator (unopt args.creator) pdf;
if args.debugcrypt then Printf.printf "really_write_pdf\n%!"; if args.debugcrypt then Printf.printf "really_write_pdf\n";
let will_linearize = let will_linearize =
args.linearize || args.keeplinearize && pdf.Pdf.was_linearized args.linearize || args.keeplinearize && pdf.Pdf.was_linearized
in in
@ -3262,7 +3266,7 @@ let write_pdf ?(encryption = None) ?(is_decompress=false) mk_id pdf =
with with
End_of_file -> End_of_file ->
begin try close_in temp_file; Sys.remove temp with begin try close_in temp_file; Sys.remove temp with
e -> Printf.eprintf "Failed to remove temp file %s (%s)\n%!" temp (Printexc.to_string e) e -> Pdfe.log (Printf.sprintf "Failed to remove temp file %s (%s)\n" temp (Printexc.to_string e))
end; end;
flush stdout (*r For Windows *) flush stdout (*r For Windows *)
@ -3393,9 +3397,9 @@ let collate (names, pdfs, ranges) =
let warn_prerotate range pdf = let warn_prerotate range pdf =
if not args.prerotate && not (Cpdfpage.allupright range pdf) then if not args.prerotate && not (Cpdfpage.allupright range pdf) then
Printf.eprintf "Some pages in the range have non-zero rotation or non (0,0)-based mediabox. \ Pdfe.log "Some pages in the range have non-zero rotation or non (0,0)-based mediabox. \
Consider adding -prerotate or pre-processing with -upright. \ Consider adding -prerotate or pre-processing with -upright. \
To silence this warning use -no-warn-rotate\n%!" To silence this warning use -no-warn-rotate\n"
let prerotate range pdf = let prerotate range pdf =
Cpdfpage.upright ~fast:args.fast range pdf Cpdfpage.upright ~fast:args.fast range pdf
@ -3426,13 +3430,13 @@ let embed_font () =
let check_bookmarks_mistake () = let check_bookmarks_mistake () =
if args.merge_add_bookmarks_use_titles && not args.merge_add_bookmarks then if args.merge_add_bookmarks_use_titles && not args.merge_add_bookmarks then
Printf.eprintf "Warning: -merge-add-bookmarks-use-titles is for use with -merge-add-bookmarks\n" Pdfe.log "Warning: -merge-add-bookmarks-use-titles is for use with -merge-add-bookmarks\n"
let check_clashing_output_name () = let check_clashing_output_name () =
match args.out with match args.out with
| File s -> | File s ->
if (List.exists (function (InFile s', _, _, _, _, _) when s = s' -> true | _ -> false) args.inputs) then if (List.exists (function (InFile s', _, _, _, _, _) when s = s' -> true | _ -> false) args.inputs) then
Printf.eprintf "Warning: output file name clashes with input file name. Malformed file may result.\n" Pdfe.log "Warning: output file name clashes with input file name. Malformed file may result.\n"
| _ -> () | _ -> ()
(* Main function *) (* Main function *)
@ -3688,7 +3692,7 @@ let go () =
Pdf.iter_stream Pdf.iter_stream
(function stream -> (function stream ->
try Pdfcodec.decode_pdfstream_until_unknown pdf stream with try Pdfcodec.decode_pdfstream_until_unknown pdf stream with
e -> Printf.eprintf "Decode failure: %s. Carrying on...\n%!" (Printexc.to_string e); ()) e -> Pdfe.log (Printf.sprintf "Decode failure: %s. Carrying on...\n" (Printexc.to_string e)); ())
pdf; pdf;
write_pdf ~is_decompress:true false pdf write_pdf ~is_decompress:true false pdf
| Some Compress -> | Some Compress ->
@ -4386,7 +4390,7 @@ let check_command_line () =
let parse_argv () s specs anon_fun usage_msg = let parse_argv () s specs anon_fun usage_msg =
if args.debug then if args.debug then
Array.iter (Printf.eprintf "arg: %s\n%!") Sys.argv; Array.iter (fun s -> Pdfe.log (Printf.sprintf "arg: %s\n" s)) Sys.argv;
Arg.parse_argv ~current:(ref 0) s specs anon_fun usage_msg; Arg.parse_argv ~current:(ref 0) s specs anon_fun usage_msg;
check_command_line () check_command_line ()
@ -4408,7 +4412,7 @@ let expand_args argv =
let gs_malformed_force fi fo = let gs_malformed_force fi fo =
if args.path_to_ghostscript = "" then begin if args.path_to_ghostscript = "" then begin
Printf.eprintf "Please supply path to gs with -gs\n%!"; Pdfe.log "Please supply path to gs with -gs\n";
exit 2 exit 2
end; end;
let gscall = let gscall =
@ -4418,7 +4422,7 @@ let gs_malformed_force fi fo =
in in
match Sys.command gscall with match Sys.command gscall with
| 0 -> exit 0 | 0 -> exit 0
| _ -> Printf.eprintf "Failed to mend file.\n%!"; exit 2 | _ -> Pdfe.log "Failed to mend file.\n"; exit 2
let process_env_vars () = let process_env_vars () =
match Sys.getenv_opt "CPDF_DEBUG" with match Sys.getenv_opt "CPDF_DEBUG" with
@ -4447,9 +4451,8 @@ let go_withargv argv =
flprint "This demo is for evaluation only. http://www.coherentpdf.com/\n"; flprint "This demo is for evaluation only. http://www.coherentpdf.com/\n";
if noncomp then if noncomp then
begin begin
prerr_string "For non-commercial use only\n"; Pdfe.log "For non-commercial use only\n";
prerr_string "To purchase a license visit http://www.coherentpdf.com/\n\n"; Pdfe.log "To purchase a license visit http://www.coherentpdf.com/\n\n";
flush stderr
end; end;
try try
(* Pre-expand -args *) (* Pre-expand -args *)
@ -4480,23 +4483,20 @@ let go_withargv argv =
exit 0 exit 0
with with
| Arg.Bad s -> | Arg.Bad s ->
prerr_string Pdfe.log
(implode (takewhile (neq '\n') (explode s)) ^ " Use -help for help.\n\n"); (implode (takewhile (neq '\n') (explode s)) ^ " Use -help for help.\n\n");
flush stderr;
if not !stay_on_error then exit 2 else raise StayOnError if not !stay_on_error then exit 2 else raise StayOnError
| Arg.Help _ -> | Arg.Help _ ->
Arg.usage (align_specs specs) usage_msg; Arg.usage (align_specs specs) usage_msg;
flush stderr (*r for Windows *) flush stderr (*r for Windows *)
| Sys_error s as e -> | Sys_error s as e ->
prerr_string (s ^ "\n\n"); Pdfe.log (s ^ "\n\n");
flush stderr;
if not !stay_on_error then if not !stay_on_error then
(if args.debug then raise e else exit 2) (if args.debug then raise e else exit 2)
else raise StayOnError else raise StayOnError
| Pdf.PDFError s as e -> | Pdf.PDFError s as e ->
prerr_string Pdfe.log
("cpdf encountered an error. Technical details follow:\n\n" ^ s ^ "\n\n"); ("cpdf encountered an error. Technical details follow:\n\n" ^ s ^ "\n\n");
flush stderr;
if not !stay_on_error then if not !stay_on_error then
if args.debug then raise e else exit 2 if args.debug then raise e else exit 2
else else
@ -4504,10 +4504,9 @@ let go_withargv argv =
| Cpdferror.SoftError s -> soft_error s | Cpdferror.SoftError s -> soft_error s
| Cpdferror.HardError s -> error s | Cpdferror.HardError s -> error s
| e -> | e ->
prerr_string Pdfe.log
("cpdf encountered an unexpected error. Technical Details follow:\n" ^ ("cpdf encountered an unexpected error. Technical Details follow:\n" ^
Printexc.to_string e ^ "\n\n"); Printexc.to_string e ^ "\n\n");
flush stderr;
if not !stay_on_error then if not !stay_on_error then
(if args.debug then raise e else exit 2) else raise StayOnError (if args.debug then raise e else exit 2) else raise StayOnError

3
cpdfcoord.ml
View File

@ -3,8 +3,7 @@ open Pdfutil
let emptypage = Pdfpage.blankpage Pdfpaper.a4 let emptypage = Pdfpage.blankpage Pdfpaper.a4
let error s = let error s =
prerr_string (s ^ "\nUse -help for help.\n"); Pdfe.log (s ^ "\nUse -help for help.\n");
flush stderr;
exit 2 exit 2
(* Unit conversions to points. *) (* Unit conversions to points. *)

4
cpdffont.ml
View File

@ -5,7 +5,7 @@ open Pdfio
(* Embed missing fonts with Ghostscript. *) (* Embed missing fonts with Ghostscript. *)
let embed_missing_fonts path_to_ghostscript gs_quiet fi fo = let embed_missing_fonts path_to_ghostscript gs_quiet fi fo =
if path_to_ghostscript = "" then begin if path_to_ghostscript = "" then begin
Printf.eprintf "Please supply path to gs with -gs\n%!"; Pdfe.log "Please supply path to gs with -gs\n";
exit 2 exit 2
end; end;
let gscall = let gscall =
@ -19,7 +19,7 @@ let embed_missing_fonts path_to_ghostscript gs_quiet fi fo =
in in
match Sys.command gscall with match Sys.command gscall with
| 0 -> exit 0 | 0 -> exit 0
| _ -> Printf.eprintf "Font embedding failed.\n%!"; exit 2 | _ -> Pdfe.log "Font embedding failed.\n"; exit 2
(* Copy a font from [frompdf] with name [fontname] on page [fontpage] to [pdf] on all pages in [range] *) (* Copy a font from [frompdf] with name [fontname] on page [fontpage] to [pdf] on all pages in [range] *)
let copy_font frompdf fontname fontpage range pdf = let copy_font frompdf fontname fontpage range pdf =

10
cpdfimage.ml
View File

@ -70,14 +70,14 @@ let write_image path_to_p2p path_to_im pdf resources name image =
begin match path_to_p2p with begin match path_to_p2p with
| "" -> | "" ->
begin match path_to_im with begin match path_to_im with
"" -> Printf.eprintf "Neither pnm2png nor imagemagick found. Specify with -p2p or -im\n%!" "" -> Pdfe.log "Neither pnm2png nor imagemagick found. Specify with -p2p or -im\n"
| _ -> | _ ->
begin match begin match
Sys.command (Filename.quote_command path_to_im [pnm; png]) Sys.command (Filename.quote_command path_to_im [pnm; png])
with with
0 -> Sys.remove pnm 0 -> Sys.remove pnm
| _ -> | _ ->
Printf.eprintf "Call to imagemagick failed: did you specify -p2p or -im correctly?\n%!"; Pdfe.log "Call to imagemagick failed: did you specify -p2p or -im correctly?\n";
Sys.remove pnm Sys.remove pnm
end end
end end
@ -87,17 +87,17 @@ let write_image path_to_p2p path_to_im pdf resources name image =
with with
| 0 -> Sys.remove pnm | 0 -> Sys.remove pnm
| _ -> | _ ->
Printf.eprintf "Call to pnmtopng failed: did you specify -p2p correctly?\n%!"; Pdfe.log "Call to pnmtopng failed: did you specify -p2p correctly?\n";
Sys.remove pnm Sys.remove pnm
end end
end end
| _ -> | _ ->
Printf.eprintf "Unsupported image type when extracting image %s %!" name Pdfe.log (Printf.sprintf "Unsupported image type when extracting image %s " name)
end end
in in
match write_image_png pdf resources name image with match write_image_png pdf resources name image with
| true -> () | true -> ()
| exception x -> Printf.printf "Failed to write PNG directly (%s)\n" (Printexc.to_string x); main () | exception x -> Pdfe.log (Printf.sprintf "Failed to write PNG directly (%s)\n" (Printexc.to_string x)); main ()
| _ -> main () | _ -> main ()
let written = ref [] let written = ref []

6
cpdfjson.ml
View File

@ -204,11 +204,11 @@ let rec op_of_json = function
| `String "SCNName"::`String s::ns -> O.Op_SCNName (s, map opf (rev ns)) | `String "SCNName"::`String s::ns -> O.Op_SCNName (s, map opf (rev ns))
| `String "scnName"::`String s::ns -> O.Op_scnName (s, map opf (rev ns)) | `String "scnName"::`String s::ns -> O.Op_scnName (s, map opf (rev ns))
| j -> | j ->
Printf.eprintf "Unable to read reversed op from %s\n" (J.show (`List j)); Pdfe.log (Printf.sprintf "Unable to read reversed op from %s\n" (J.show (`List j)));
error "op reading failed" error "op reading failed"
end end
| j -> | j ->
Printf.eprintf "Unable to read op from %s\n" (J.show j); Pdfe.log (Printf.sprintf "Unable to read op from %s\n" (J.show j));
error "op reading failed" error "op reading failed"
and object_of_json = function and object_of_json = function
@ -219,7 +219,7 @@ and object_of_json = function
| `List objs -> P.Array (map object_of_json objs) | `List objs -> P.Array (map object_of_json objs)
| `Assoc ["U", `String u] -> | `Assoc ["U", `String u] ->
begin try P.String (Pdftext.pdfdocstring_of_utf8 u) with begin try P.String (Pdftext.pdfdocstring_of_utf8 u) with
_ -> Printf.eprintf "Could not read UTF8 string %S\n" u; P.String u _ -> Pdfe.log (Printf.sprintf "Could not read UTF8 string %S\n" u); P.String u
end end
| `Assoc ["I", `Int i] -> P.Integer i | `Assoc ["I", `Int i] -> P.Integer i
| `Assoc ["F", `Float f] -> P.Real f | `Assoc ["F", `Float f] -> P.Real f

4
cpdfmetadata.ml
View File

@ -487,11 +487,11 @@ let xmp_date date =
| _ -> raise Exit | _ -> raise Exit
end end
| _ -> | _ ->
Printf.eprintf "xmp_date: Malformed date string (no year): %s\n%!" date; Pdfe.log (Printf.sprintf "xmp_date: Malformed date string (no year): %s\n" date);
make_xmp_date_from_components d make_xmp_date_from_components d
end end
| _ -> | _ ->
Printf.eprintf "xmp_date: Malformed date string (no prefix): %s\n%!" date; Pdfe.log (Printf.sprintf "xmp_date: Malformed date string (no prefix): %s\n" date);
make_xmp_date_from_components d make_xmp_date_from_components d
with with
Exit -> make_xmp_date_from_components d Exit -> make_xmp_date_from_components d

4
cpdfpage.ml
View File

@ -525,7 +525,7 @@ let protect fast pdf resources content =
let qs = length (keep (eq Pdfops.Op_q) ops) in let qs = length (keep (eq Pdfops.Op_q) ops) in
let bigqs = length (keep (eq Pdfops.Op_Q) ops) in let bigqs = length (keep (eq Pdfops.Op_Q) ops) in
let deficit = if qs > bigqs then qs - bigqs else 0 in let deficit = if qs > bigqs then qs - bigqs else 0 in
if deficit <> 0 then Printf.eprintf "Q Deficit was nonzero. Fixing. %i\n%!" deficit; if deficit <> 0 then Pdfe.log (Printf.sprintf "Q Deficit was nonzero. Fixing. %i\n" deficit);
deficit deficit
in in
let addstream ops = Pdf.addobj pdf (Pdfops.stream_of_ops ops) in let addstream ops = Pdf.addobj pdf (Pdfops.stream_of_ops ops) in
@ -876,7 +876,7 @@ let trim_marks_page fast pdf n page =
in in
Pdfpage.postpend_operators pdf ops ~fast page Pdfpage.postpend_operators pdf ops ~fast page
| _, _ -> | _, _ ->
(*Printf.eprintf "warning: no /TrimBox found on page %i\n%!" n;*) (*Pdfe.log (Printf.sprintf "warning: no /TrimBox found on page %i\n" n);*)
page page
let trim_marks ?(fast=false) pdf range = let trim_marks ?(fast=false) pdf range =

2
cpdfstrftime.ml
View File

@ -199,7 +199,7 @@ let return_date () =
let current_time () = let current_time () =
try return_date () with try return_date () with
e -> e ->
Printf.eprintf "Failed to retrieve time due to %s\n%!" (Printexc.to_string e); Pdfe.log (Printf.sprintf "Failed to retrieve time due to %s\n" (Printexc.to_string e));
{_tm_sec = 0; {_tm_sec = 0;
_tm_min = 0; _tm_min = 0;
_tm_hour = 0; _tm_hour = 0;

2
cpdftoc.ml
View File

@ -51,7 +51,7 @@ let typeset_table_of_contents ~font ~fontsize ~title ~bookmark pdf =
| Cpdfembed.ExistingNamedFont -> raise (Pdf.PDFError "Cannot use existing font with -table-of-contents") | Cpdfembed.ExistingNamedFont -> raise (Pdf.PDFError "Cannot use existing font with -table-of-contents")
in in
let marks = Pdfmarks.read_bookmarks pdf in let marks = Pdfmarks.read_bookmarks pdf in
if marks = [] then (Printf.eprintf "No bookmarks, not making table of contents\n%!"; pdf) else if marks = [] then (Pdfe.log "No bookmarks, not making table of contents\n"; pdf) else
let f, fs = (font, fontsize) in let f, fs = (font, fontsize) in
let _, bfs as big = (font, fontsize *. 2.) in let _, bfs as big = (font, fontsize *. 2.) in
let firstpage = hd (Pdfpage.pages_of_pagetree pdf) in let firstpage = hd (Pdfpage.pages_of_pagetree pdf) in

2
cpdftruetype.ml
View File

@ -149,7 +149,7 @@ let read_encoding_table fmt length version b =
| 6 -> | 6 ->
if !dbg then Printf.printf "read_encoding_table: format 6\n"; if !dbg then Printf.printf "read_encoding_table: format 6\n";
read_format_6_encoding_table b; read_format_6_encoding_table b;
| n -> raise (Pdf.PDFError "read_encoding_table: format %i not known\n%!") | n -> raise (Pdf.PDFError "read_encoding_table: format %i not known\n")
let read_loca_table indexToLocFormat numGlyphs b = let read_loca_table indexToLocFormat numGlyphs b =
match indexToLocFormat with match indexToLocFormat with