fenix/cpdf-source
1
0
Fork 0
mirror of https://github.com/johnwhitington/cpdf-source.git synced 2025-01-20 12:48:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Better errors in process_images

Browse Source
This commit is contained in:
John Whitington 2024-12-18 14:20:29 +00:00
parent 9452aec1d5
commit d2847f2a25
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cpdfimage.ml
View File

@ -615,11 +615,9 @@ let jpeg_to_jpeg pdf ~pixel_threshold ~length_threshold ~percentage_threshold ~j
remove out2 remove out2
end end
else else
begin Printf.printf "external process failed\n%!";
Printf.printf "external process failed\n%!"; remove out;
remove out; remove out2
remove out2
end
let suitable_num pdf dict = let suitable_num pdf dict =
match Pdf.lookup_direct pdf "/ColorSpace" dict with match Pdf.lookup_direct pdf "/ColorSpace" dict with
@ -652,7 +650,7 @@ let lossless_out pdf ~pixel_threshold ~length_threshold extension s dict referen
if size < length_threshold then (if !debug_image_processing then Printf.printf "length threshold not met\n%!"; None) else if size < length_threshold then (if !debug_image_processing then Printf.printf "length threshold not met\n%!"; None) else
begin begin
Pdfcodec.decode_pdfstream_until_unknown pdf s; Pdfcodec.decode_pdfstream_until_unknown pdf s;
match Pdf.lookup_direct pdf "/Filter" (fst !reference) with Some _ -> restore (); None | None -> match Pdf.lookup_direct pdf "/Filter" (fst !reference) with Some x -> restore (); Printf.printf "%S Unable to decompress\n%!" (Pdfwrite.string_of_pdf x); None | None ->
let out = Filename.temp_file "cpdf" ("convertin" ^ (if suitable_num pdf dict < 4 then ".pnm" else ".cmyk")) in let out = Filename.temp_file "cpdf" ("convertin" ^ (if suitable_num pdf dict < 4 then ".pnm" else ".cmyk")) in
let out2 = Filename.temp_file "cpdf" ("convertout" ^ extension) in let out2 = Filename.temp_file "cpdf" ("convertout" ^ extension) in
let fh = open_out_bin out in let fh = open_out_bin out in
@ -714,10 +712,13 @@ let lossless_to_jpeg pdf ~pixel_threshold ~length_threshold ~percentage_threshol
end; end;
close_in result close_in result
with with
_ -> e ->
Printf.printf "Failed with %S\n%!" (Printexc.to_string e);
remove out; remove out;
remove out2 remove out2
end; end
else
Printf.printf "Return code not zero\n%!";
remove out; remove out;
remove out2 remove out2
@ -793,7 +794,8 @@ let lossless_resample pdf ~pixel_threshold ~length_threshold ~factor ~interpolat
end; end;
remove out; remove out;
remove out2 remove out2
with _ -> with e ->
Printf.printf "Unable: %S\n" (Printexc.to_string e);
remove out; remove out;
remove out2 remove out2
@ -1013,7 +1015,7 @@ let process
begin match onebppmethod with begin match onebppmethod with
| "JBIG2" -> | "JBIG2" ->
begin begin
if !debug_image_processing then Printf.printf "(%i/%i) object %i (1bpp)... %!" !ndone nobjects objnum; if !debug_image_processing then Printf.printf "(%i/%i) Object %i (1bpp)... %!" !ndone nobjects objnum;
recompress_1bpp_jbig2_lossless ~pixel_threshold ~length_threshold ~path_to_jbig2enc pdf s dict reference recompress_1bpp_jbig2_lossless ~pixel_threshold ~length_threshold ~path_to_jbig2enc pdf s dict reference
end end
| _ -> () | _ -> ()
@ -1021,14 +1023,14 @@ let process
| Some (Pdf.Name "/Image"), _, _, _ -> | Some (Pdf.Name "/Image"), _, _, _ ->
if qlossless < 101. then if qlossless < 101. then
begin begin
if !debug_image_processing then Printf.printf "(%i/%i) object %i (lossless)... %!" !ndone nobjects objnum; if !debug_image_processing then Printf.printf "(%i/%i) Object %i (lossless)... %!" !ndone nobjects objnum;
lossless_to_jpeg pdf ~pixel_threshold ~length_threshold ~percentage_threshold ~qlossless ~path_to_convert s dict reference lossless_to_jpeg pdf ~pixel_threshold ~length_threshold ~percentage_threshold ~qlossless ~path_to_convert s dict reference
end end
else else
begin begin
if factor < 101. then if factor < 101. then
begin begin
if !debug_image_processing then Printf.printf "(%i/%i) object %i (lossless)... %!" !ndone nobjects objnum; if !debug_image_processing then Printf.printf "(%i/%i) Object %i (lossless)... %!" !ndone nobjects objnum;
if factor < 0. then if factor < 0. then
lossless_resample_target_dpi objnum pdf ~pixel_threshold ~length_threshold ~factor:~-.factor ~target_dpi_info ~interpolate ~path_to_convert s dict reference lossless_resample_target_dpi objnum pdf ~pixel_threshold ~length_threshold ~factor:~-.factor ~target_dpi_info ~interpolate ~path_to_convert s dict reference
else else