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

Continuing with audit and fixes for used of Pdfpage.change_pages

This commit is contained in:
John Whitington 2016-11-27 15:39:19 +00:00
parent 060ae4d851
commit e92fdeafef
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cpdf.ml
View File

@ -2327,7 +2327,7 @@ let stamp relative_to_cropbox position topline midline fast scale_to_fit isover
let over_firstpage_pdf = let over_firstpage_pdf =
match Pdfpage.pages_of_pagetree over with match Pdfpage.pages_of_pagetree over with
| [] -> error "empty PDF" | [] -> error "empty PDF"
| h::_ -> Pdfpage.change_pages true over [h] | h::_ -> Pdfpage.change_pages ~changes:[(1, 1)] true over [h]
in in
let merged = let merged =
Pdfmerge.merge_pdfs Pdfmerge.merge_pdfs
@ -2351,19 +2351,16 @@ let stamp relative_to_cropbox position topline midline fast scale_to_fit isover
pageseqs pageseqs
under_pages under_pages
in in
let changed = Pdfpage.change_pages true merged (new_pages @ [last new_pages]) in let changed =
(* we use new_pages @ new_pages here to preserve the number of pages let changes =
* so that Pdfpage.change_pages can do its renumbering properly. List.map (fun x -> (x, x)) (ilist 1 (length new_pages))
* Otherwise things like outlines are lost. TODO: Fix
* Pdfpage.change_pages properly. For now, we just use
* Pdfpage.pdf_of_pages afterward to chop it. *)
let cut =
Pdfpage.pdf_of_pages ~retain_numbering:true changed (ilist 1 (length new_pages))
in in
let new_refnumbers = Pdf.page_reference_numbers cut in Pdfpage.change_pages ~changes true merged new_pages
in
let new_refnumbers = Pdf.page_reference_numbers changed in
let changetable = hashtable_of_dictionary (List.combine marks_refnumbers new_refnumbers) in let changetable = hashtable_of_dictionary (List.combine marks_refnumbers new_refnumbers) in
let new_marks = map (change_bookmark changetable) marks in let new_marks = map (change_bookmark changetable) marks in
Pdfmarks.add_bookmarks new_marks cut Pdfmarks.add_bookmarks new_marks changed
(* Combine pages from two PDFs. For now, assume equal length. *) (* Combine pages from two PDFs. For now, assume equal length. *)
@ -2373,14 +2370,21 @@ let equalize_pages under over =
let length_under = Pdfpage.endpage under in let length_under = Pdfpage.endpage under in
let length_over = Pdfpage.endpage over in let length_over = Pdfpage.endpage over in
if length_over > length_under then if length_over > length_under then
under, let changes =
(Pdfpage.change_pages true over (take (Pdfpage.pages_of_pagetree over) length_under)) List.map (fun x -> (x, x)) (ilist 1 length_under)
in
(under,
(Pdfpage.change_pages
~changes true over (take (Pdfpage.pages_of_pagetree over) length_under)))
else if length_under > length_over then else if length_under > length_over then
under, let changes =
Pdfpage.change_pages true List.map (fun x -> (x, x)) (ilist 1 length_over)
over in
(under,
Pdfpage.change_pages
~changes true over
(Pdfpage.pages_of_pagetree over @ (Pdfpage.pages_of_pagetree over @
(many (Pdfpage.blankpage Pdfpaper.a4) (length_under - length_over))) (many (Pdfpage.blankpage Pdfpaper.a4) (length_under - length_over))))
else else
under, over under, over