This commit is contained in:
John Whitington 2016-11-24 19:10:53 +00:00
parent 79e03887bf
commit a0446f7f1c
2 changed files with 3 additions and 4 deletions

View File

@ -2385,7 +2385,7 @@ let equalize_pages under over =
under, over under, over
let combine_pages (fast : bool) under over scaletofit swap equalize = let combine_pages (fast : bool) under over scaletofit swap equalize =
let debug_combine_pages = true in (* DEBUG *) let debug_combine_pages = false in (* DEBUG *)
let debug_pdf pdf n = let debug_pdf pdf n =
if debug_combine_pages then if debug_combine_pages then
begin begin
@ -2879,8 +2879,7 @@ let copy_annotations_page topdf frompdf frompage topage =
in in
List.iter List.iter
(function (function
(* FIXME: We assume they are indirects. Must also do direct, though (* FIXME: We assume they are indirects. Must also do direct, though rare.*)
rare.*)
Pdf.Indirect x -> Pdf.Indirect x ->
(*Printf.printf "Copying annotation %s which is\n%s\n" (*Printf.printf "Copying annotation %s which is\n%s\n"
(Pdfwrite.string_of_pdf (Pdf.Indirect x)) (Pdfwrite.string_of_pdf (Pdf.Indirect x))

View File

@ -2642,7 +2642,7 @@ let rec image_resolution_page pdf page pagenum dpi (images : (int * string * xob
Pdfpage.rotate = Pdfpage.Rotate0; Pdfpage.rotate = Pdfpage.Rotate0;
Pdfpage.rest = Pdf.Dictionary []} Pdfpage.rest = Pdf.Dictionary []}
in in
let newpdf = Pdfpage.change_pages true pdf [page] in let newpdf = Pdfpage.change_pages false pdf [page] in
image_resolution newpdf [pagenum] dpi image_resolution newpdf [pagenum] dpi
| (pagenum, name, Image (w, h)) -> | (pagenum, name, Image (w, h)) ->
let lx = Pdfunits.convert 0. Pdfunits.PdfPoint Pdfunits.Inch (distance_between o x) let lx = Pdfunits.convert 0. Pdfunits.PdfPoint Pdfunits.Inch (distance_between o x)