This commit is contained in:
John Whitington 2020-02-27 13:16:26 +01:00
parent 803e5b38d5
commit 908799683f
1 changed files with 10 additions and 9 deletions

View File

@ -3566,7 +3566,7 @@ let write_json output pdf =
(* 1. Get list of indirects of all OCGs from the /OCProperties, and their textual names (* 1. Get list of indirects of all OCGs from the /OCProperties, and their textual names
* 2. Calculate a change list to coalesce them * 2. Calculate a change list to coalesce them
* 3. Remove any changed ones from the /OCGs and /Order in /OCProperties * 3. Remove any changed ones from the /OCGs and /Order and /ON and /OFF in /OCProperties
* 4. Do the changes to all indirect references in the whole pdf *) * 4. Do the changes to all indirect references in the whole pdf *)
(*FIXME Pre-existing nulls - what to do? *) (*FIXME Pre-existing nulls - what to do? *)
let ocg_coalesce pdf = let ocg_coalesce pdf =
@ -3599,14 +3599,14 @@ let ocg_coalesce pdf =
end end
| _ -> failwith "Malformed or missing /OCGs" | _ -> failwith "Malformed or missing /OCGs"
in in
iter (fun (num, name) -> Printf.printf "%i = %s\n" num name) number_name_pairs; (*iter (fun (num, name) -> Printf.printf "%i = %s\n" num name) number_name_pairs;*)
let changes = let changes =
let cf (_, name) (_, name') = compare name name' in let cf (_, name) (_, name') = compare name name' in
let sets = collate cf (List.stable_sort cf number_name_pairs) in let sets = collate cf (List.stable_sort cf number_name_pairs) in
flatten (option_map (function [] -> None | (hnum, _)::t -> Some (map (function (tnum, _) -> (tnum, hnum)) t)) sets) flatten (option_map (function [] -> None | (hnum, _)::t -> Some (map (function (tnum, _) -> (tnum, hnum)) t)) sets)
in in
Printf.printf "\nChanges are:\n"; (*Printf.printf "\nChanges are:\n";
List.iter (fun (f, t) -> Printf.printf "%i -> %i\n" f t) changes; List.iter (fun (f, t) -> Printf.printf "%i -> %i\n" f t) changes;*)
let new_ocproperties = let new_ocproperties =
let remove_from_array key nums dict = let remove_from_array key nums dict =
match Pdf.lookup_direct pdf key dict with match Pdf.lookup_direct pdf key dict with
@ -3627,17 +3627,18 @@ let ocg_coalesce pdf =
| _ -> failwith "No /D dict in OCGProperties" | _ -> failwith "No /D dict in OCGProperties"
in in
let nums = map fst changes in let nums = map fst changes in
Printf.printf "\nto remove:\n"; (*Printf.printf "\nto remove:\n";
List.iter (Printf.printf "%i ") nums; List.iter (Printf.printf "%i ") nums;*)
remove_from_array "/OCGs" nums remove_from_array "/OCGs" nums
(remove_from_array_inside_d "/ON" nums (remove_from_array_inside_d "/ON" nums
(remove_from_array_inside_d "/OFF" nums (remove_from_array_inside_d "/OFF" nums
(remove_from_array_inside_d "/Order" nums ocpdict))) (remove_from_array_inside_d "/Order" nums ocpdict)))
in in
flprint (Pdfwrite.string_of_pdf new_ocproperties); (*flprint (Pdfwrite.string_of_pdf new_ocproperties);*)
let ocp_objnum = Pdf.addobj pdf new_ocproperties in let ocp_objnum = Pdf.addobj pdf new_ocproperties in
let new_catalog = Pdf.add_dict_entry (Pdf.catalog_of_pdf pdf) "/OCProperties" (Pdf.Indirect ocp_objnum) in let new_catalog = Pdf.addobj pdf (Pdf.add_dict_entry (Pdf.catalog_of_pdf pdf) "/OCProperties" (Pdf.Indirect ocp_objnum)) in
pdf.Pdf.trailerdict <- Pdf.add_dict_entry pdf.Pdf.trailerdict "/Root" new_catalog; pdf.Pdf.trailerdict <- Pdf.add_dict_entry pdf.Pdf.trailerdict "/Root" (Pdf.Indirect new_catalog);
pdf.Pdf.root <- new_catalog;
Pdf.objselfmap (Pdf.renumber_object_parsed pdf (hashtable_of_dictionary changes)) pdf; Pdf.objselfmap (Pdf.renumber_object_parsed pdf (hashtable_of_dictionary changes)) pdf;
pdf pdf