Cut old copy_annotations code

cpdfannot.ml

@@ -176,118 +176,7 @@ let set_annotations_json pdf i =
         ()
   | _ -> error "Bad Annotations JSON file"
 
-(* Equalise the page lengths of two PDFs by chopping or extending the first one.
+let copy_annotations range frompdf topdf = ()
-*)
-let equalise_lengths a b =
-  let a' =
-    if Pdfpage.endpage a < Pdfpage.endpage b then
-      Pdfpage.change_pages false a
-        (Pdfpage.pages_of_pagetree a @
-           many (Pdfpage.blankpage Pdfpaper.a4) (Pdfpage.endpage b - Pdfpage.endpage a))
-    else if Pdfpage.endpage a > Pdfpage.endpage b then
-      Pdfpage.change_pages false a
-        (take (Pdfpage.pages_of_pagetree a) (Pdfpage.endpage b))
-    else a 
-  in
-    a', b
-
-(* Copy annotations. FIXME: This code is deprecated in favour of extracting annotations to JSON
-and then re-adding. *)
-
-(* FIXME: Why does this chop the files to the same length? Should be able to
-apply annotations from a longer file to a shorter? *)
-
-(* Rewrite any annotation destinations to point to pages in the
-destination file. This prevents pages being copied, and ensures the links are
-correct Any Indirect link inside a /Dest is rewritten if in the table. If not
-inside a /Dest, nothing is rewritten. *)
-let rec renumber_in_dest table indest = function
-    Pdf.Indirect i -> 
-      begin
-        try Pdf.Indirect (Hashtbl.find table i) with _ -> Pdf.Indirect i
-      end
-  | Pdf.Array a ->
-      Pdf.recurse_array (renumber_in_dest table indest) a
-  | Pdf.Dictionary d ->
-      Pdf.Dictionary
-        (map
-          (function
-             ("/Dest", v) -> ("/Dest", renumber_in_dest table true v)
-           | (k, v) -> (k, renumber_in_dest table indest v))
-          d)
-  | x -> x 
-
-let renumber_in_object pdf objnum table =
-  Pdf.addobj_given_num
-    pdf (objnum, (renumber_in_dest table false (Pdf.lookup_obj pdf objnum)))
-
-let copy_annotations_page topdf frompdf frompage topage =
-  match Pdf.lookup_direct frompdf "/Annots" frompage.Pdfpage.rest with
-    Some (Pdf.Array frompage_annots as annots) ->
-      let table =
-        hashtable_of_dictionary
-          (combine
-             (Pdf.page_reference_numbers frompdf)
-             (Pdf.page_reference_numbers topdf))
-      in
-        iter
-         (function
-            (* FIXME: We assume they are indirects. Must also do direct, though rare.*)
-            Pdf.Indirect x ->
-              (*Printf.printf "Copying annotation %s which is\n%s\n"
-                (Pdfwrite.string_of_pdf (Pdf.Indirect x))
-                (Pdfwrite.string_of_pdf (Pdf.direct frompdf (Pdf.Indirect
-                x)));*)
-              renumber_in_object frompdf x table
-          | _ -> ())
-         frompage_annots;
-        let objects_to_copy = Pdf.objects_referenced [] [] frompdf annots in
-          iter
-            (fun n ->
-               ignore (Pdf.addobj_given_num topdf (n, Pdf.lookup_obj frompdf n)))
-            objects_to_copy;
-          let topage_annots =
-            match Pdf.lookup_direct frompdf "/Annots" topage.Pdfpage.rest with
-            | Some (Pdf.Array annots) -> annots
-            | _ -> []
-          in
-            let merged_dict = Pdf.Array (frompage_annots @ topage_annots) in
-              let topage' =
-                {topage with Pdfpage.rest =
-                   Pdf.add_dict_entry topage.Pdfpage.rest "/Annots" merged_dict}
-              in
-                topdf, topage'
-  | Some x -> topdf, topage
-  | None -> topdf, topage
-
-let copy_annotations range frompdf topdf =
-  let frompdf, topdf = equalise_lengths frompdf topdf in
-    match Pdf.renumber_pdfs [frompdf; topdf] with 
-    | [frompdf; topdf] ->
-        let frompdf_pages = Pdfpage.pages_of_pagetree frompdf in
-        let topdf_pages = Pdfpage.pages_of_pagetree topdf in
-          let pdf = ref topdf
-          and pages = ref []
-          and pnum = ref 1
-          and frompdf_pages = ref frompdf_pages
-          and topdf_pages = ref topdf_pages in
-            (* Go through, updating pdf and collecting new pages. *)
-            while not (isnull !frompdf_pages) do
-              let frompdf_page = hd !frompdf_pages
-              and topdf_page = hd !topdf_pages in
-                let pdf', page =
-                  if mem !pnum range
-                    then copy_annotations_page !pdf frompdf frompdf_page topdf_page
-                    else !pdf, topdf_page
-                in
-                  pdf := pdf';
-                  pages =| page;
-                  incr pnum;
-                  frompdf_pages := tl !frompdf_pages;
-                  topdf_pages := tl !topdf_pages
-            done;
-            Pdfpage.change_pages true !pdf (rev !pages)
-    | _ -> assert false
 
 (* Remove annotations *)
 let remove_annotations range pdf =

cpdfannot.mli

@@ -15,5 +15,5 @@ val get_annotations : Cpdfmetadata.encoding -> Pdf.t -> (int * string) list
 (** List the annotations to standard output in a given encoding. See cpdfmanual.pdf for the format details. *)
 val list_annotations : json:bool -> int list -> Cpdfmetadata.encoding -> Pdf.t -> unit
 
-(** Copy the annotations on a given set of pages from a to b. b is returned. *)
+(** Copy the annotations on a given set of pages *)
-val copy_annotations : int list -> Pdf.t -> Pdf.t -> Pdf.t
+val copy_annotations : int list -> Pdf.t -> Pdf.t -> unit

cpdfcommand.ml

@@ -3975,15 +3975,13 @@ let go () =
   | Some (CopyAnnotations getfrom) ->
       begin match args.inputs with
       | [(k, _, u, o, _, _) as input] ->
-        let input_pdf = get_pdf_from_input_kind input args.op k in
+          let input_pdf = get_pdf_from_input_kind input args.op k in
           let range = parse_pagespec_allow_empty input_pdf (get_pagespec ()) in
-            let pdf =
+            Cpdfannot.copy_annotations
-              Cpdfannot.copy_annotations
+              range
-                range
+              (pdfread_pdf_of_file (optstring u) (optstring o) getfrom)
-                (pdfread_pdf_of_file (optstring u) (optstring o) getfrom)
+              input_pdf;
-                input_pdf
+            write_pdf false input_pdf
-          in
-            write_pdf false pdf
       | _ -> error "copy-annotations: No input file specified"
       end
   | Some (SetAnnotations json) ->