fenix/cpdf-source
1
0
Fork 0
mirror of https://github.com/johnwhitington/cpdf-source.git synced 2025-02-16 11:50:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds clipping on -twoup to make sure content off the page doesn't bleed on to it

Browse Source
This commit is contained in:
John Whitington 2015-05-31 14:01:38 +01:00
parent 9ed0b208b1
commit 26378caeff
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cpdf.ml
View File

@ -2715,14 +2715,25 @@ let twoup_pages pdf = function
(map (fun p -> p.Pdfpage.resources) pages) (map (fun p -> p.Pdfpage.resources) pages)
in in
let content' = let content' =
let transform_stream contents transform = let transform_stream clipbox contents transform =
let ops = Pdfops.parse_operators pdf resources' contents in let clipops =
(* Need protect_removeme here? especially new, Q-adding protect? *) let minx, miny, maxx, maxy = Pdf.parse_rectangle clipbox in
Pdfops.stream_of_ops [Pdfops.Op_re (minx, miny, maxx -. minx, maxy -. miny);
([Pdfops.Op_q] @ [Pdfops.Op_cm transform] @ ops @ [Pdfops.Op_Q]) Pdfops.Op_n;
Pdfops.Op_W]
in
let ops = Pdfops.parse_operators pdf resources' contents in
(* Need protect_removeme here? especially new, Q-adding protect? *)
Pdfops.stream_of_ops
([Pdfops.Op_q] @ [Pdfops.Op_cm transform] @ clipops @ ops @ [Pdfops.Op_Q])
in in
map2 map2
(fun p -> transform_stream p.Pdfpage.content) (fun p ->
transform_stream
(match Pdf.lookup_direct pdf "/CropBox" p.Pdfpage.rest with
None -> p.Pdfpage.mediabox
| Some box -> box)
p.Pdfpage.content)
pages pages
(take (twoup_transforms h.Pdfpage.mediabox) (length pages)) (take (twoup_transforms h.Pdfpage.mediabox) (length pages))
in in
@ -2732,15 +2743,6 @@ let twoup_pages pdf = function
Pdfpage.resources = resources'; Pdfpage.resources = resources';
Pdfpage.rest = h.Pdfpage.rest} Pdfpage.rest = h.Pdfpage.rest}
(* Main function *)
let twoup pdf =
let pdf = upright (ilist 1 (Pdfpage.endpage pdf)) pdf in
let pages = Pdfpage.pages_of_pagetree pdf in
let pagesets = splitinto 2 pages in
let renumbered = map (Pdfpage.renumber_pages pdf) pagesets in
let pages' = map (twoup_pages pdf) renumbered in
Pdfpage.change_pages true pdf pages'
let twoup_stack_transforms mediabox = let twoup_stack_transforms mediabox =
let width, height = let width, height =
match Pdf.parse_rectangle mediabox with match Pdf.parse_rectangle mediabox with
@ -2753,6 +2755,7 @@ let twoup_stack_transforms mediabox =
in let t1 = Pdftransform.matrix_of_transform [tr1; rotate] in in let t1 = Pdftransform.matrix_of_transform [tr1; rotate] in
[t0; t1] [t0; t1]
(* FIXME: Add clipping, as for twoup, or merge these two functions properly *)
let twoup_pages_stack pdf = function let twoup_pages_stack pdf = function
| [] -> assert false | [] -> assert false
| (h::_) as pages -> | (h::_) as pages ->
@ -2787,14 +2790,18 @@ let twoup_pages_stack pdf = function
Pdfpage.resources = resources; Pdfpage.resources = resources;
Pdfpage.rest = rest} Pdfpage.rest = rest}
let twoup_stack pdf = let f_twoup f_pages pdf =
let pdf = upright (ilist 1 (Pdfpage.endpage pdf)) pdf in let pdf = upright (ilist 1 (Pdfpage.endpage pdf)) pdf in
let pages = Pdfpage.pages_of_pagetree pdf in let pages = Pdfpage.pages_of_pagetree pdf in
let pagesets = splitinto 2 pages in let pagesets = splitinto 2 pages in
let renumbered = map (Pdfpage.renumber_pages pdf) pagesets in let renumbered = map (Pdfpage.renumber_pages pdf) pagesets in
let pages' = map (twoup_pages_stack pdf) renumbered in let pages' = map (f_pages pdf) renumbered in
Pdfpage.change_pages true pdf pages' Pdfpage.change_pages true pdf pages'
let twoup pdf = f_twoup twoup_pages pdf
let twoup_stack pdf = f_twoup twoup_pages_stack pdf
(* \section{Output info} *) (* \section{Output info} *)
let get_info raw pdf = let get_info raw pdf =
let infodict = let infodict =