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

Lift dryrun out fo draw_single_page

This commit is contained in:
John Whitington 2023-10-23 16:53:27 +01:00
parent d161ec3b21
commit 39235ac5ce
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cpdfdraw.ml
View File

@ -372,23 +372,14 @@ let save_whole_stack () =
let restore_whole_stack r = let restore_whole_stack r =
resstack := r resstack := r
let draw_single ~fast ~underneath ~filename ~bates ~batespad fast range pdf drawops = let draw_single ~fast ~underneath ~filename ~bates ~batespad range pdf drawops =
(res ()).num <- max (res ()).num (minimum_resource_number pdf range); (res ()).num <- max (res ()).num (minimum_resource_number pdf range);
let endpage = Pdfpage.endpage pdf in let endpage = Pdfpage.endpage pdf in
let pages = Pdfpage.pages_of_pagetree pdf in let pages = Pdfpage.pages_of_pagetree pdf in
let ops = let ops =
if contains_specials drawops if contains_specials drawops
then None then None
else else Some (ops_of_drawops false pdf endpage filename bates batespad 0 (hd pages) drawops)
begin
let r = save_whole_stack () in
let saved_fontpacks = Hashtbl.copy !fontpacks in
ignore (ops_of_drawops true pdf endpage filename bates batespad 0 (hd pages) drawops);
restore_whole_stack r;
fontpacks := saved_fontpacks;
(*Printf.printf "--------------------------\n";*)
Some (ops_of_drawops false pdf endpage filename bates batespad 0 (hd pages) drawops)
end
in in
let ss = let ss =
map2 map2
@ -397,13 +388,7 @@ let draw_single ~fast ~underneath ~filename ~bates ~batespad fast range pdf draw
then then
(match ops with (match ops with
| Some x -> x | Some x -> x
| None -> | None -> ops_of_drawops false pdf endpage filename bates batespad n p drawops)
let r = save_whole_stack () in
let saved_fontpacks = Hashtbl.copy !fontpacks in
ignore (ops_of_drawops true pdf endpage filename bates batespad n p drawops);
restore_whole_stack r;
fontpacks := saved_fontpacks;
ops_of_drawops false pdf endpage filename bates batespad n p drawops)
else []) else [])
(ilist 1 endpage) (ilist 1 endpage)
pages pages
@ -420,8 +405,25 @@ let draw_single ~fast ~underneath ~filename ~bates ~batespad fast range pdf draw
in in
Pdfpage.change_pages true pdf pages Pdfpage.change_pages true pdf pages
(* Do a dry run of all the drawing to collect subset information. *)
let dryrun ~filename ~bates ~batespad range pdf chunks =
let endpage = Pdfpage.endpage pdf in
let pages = Pdfpage.pages_of_pagetree pdf in
let r = save_whole_stack () in
let saved_fontpacks = Hashtbl.copy !fontpacks in
let pagenum = ref (hd range) in
iter
(fun chunk ->
ignore (ops_of_drawops true pdf endpage filename bates batespad !pagenum (hd pages) chunk);
match range with
| [x] when endpage > x -> pagenum := x + 1
| _ -> pagenum := endpage + 1)
chunks;
restore_whole_stack r;
fontpacks := saved_fontpacks
let draw ?(fast=false) ?(underneath=false) ~filename ~bates ~batespad range pdf drawops = let draw ?(fast=false) ?(underneath=false) ~filename ~bates ~batespad range pdf drawops =
(*Printf.printf "%s\n" (string_of_drawops drawops); *) (*Printf.printf "%s\n" (string_of_drawops drawops);*)
resstack := [empty_res ()]; resstack := [empty_res ()];
Hashtbl.clear !fontpacks; Hashtbl.clear !fontpacks;
(res ()).time <- Cpdfstrftime.current_time (); (res ()).time <- Cpdfstrftime.current_time ();
@ -430,9 +432,10 @@ let draw ?(fast=false) ?(underneath=false) ~filename ~bates ~batespad range pdf
(* Double up a trailing NewPage so it actually does something... *) (* Double up a trailing NewPage so it actually does something... *)
let drawops = match rev drawops with NewPage::t -> rev (NewPage::NewPage::t) | _ -> drawops in let drawops = match rev drawops with NewPage::t -> rev (NewPage::NewPage::t) | _ -> drawops in
let chunks = ref (split_around (eq NewPage) drawops) in let chunks = ref (split_around (eq NewPage) drawops) in
dryrun ~filename ~bates ~batespad !range !pdf !chunks;
while !chunks <> [] do while !chunks <> [] do
reset_state (); reset_state ();
if hd !chunks <> [] then pdf := draw_single ~fast ~underneath ~filename ~bates ~batespad fast !range !pdf (hd !chunks); if hd !chunks <> [] then pdf := draw_single ~fast ~underneath ~filename ~bates ~batespad !range !pdf (hd !chunks);
chunks := tl !chunks; chunks := tl !chunks;
if !chunks <> [] then begin if !chunks <> [] then begin
(* If the range is just a single page, and there is a next page, move to it. Otherwise, (* If the range is just a single page, and there is a next page, move to it. Otherwise,