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

more

This commit is contained in:
John Whitington 2021-10-01 15:46:42 +01:00
parent d4f0bd202d
commit 806e94fb70
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpdfJSON.ml
View File

@ -237,14 +237,14 @@ let json_of_pdf parse_content no_stream_data pdf =
(fun (objnum, obj) -> (fun (objnum, obj) ->
if mem objnum !content_streams then if mem objnum !content_streams then
begin match obj with begin match obj with
| J.Array [dict; J.String _] -> | J.Object ["S", J.Array [dict; J.String _]] ->
(* FIXME Proper resources here for reasons explained above? *) (* FIXME Proper resources here for reasons explained above? *)
let streamdata = let streamdata =
match P.lookup_obj pdf objnum with match P.lookup_obj pdf objnum with
| P.Stream {contents = (_, P.Got b)} -> b | P.Stream {contents = (_, P.Got b)} -> b
| _ -> failwith "JSON: stream not decoded" | _ -> failwith "JSON: stream not decoded"
in in
(objnum, J.Array [dict; parse_content_stream pdf (P.Dictionary []) streamdata]) (objnum, J.Object ["S", J.Array [dict; parse_content_stream pdf (P.Dictionary []) streamdata]])
| _ -> failwith "json_of_pdf: stream parsing inconsistency" | _ -> failwith "json_of_pdf: stream parsing inconsistency"
end end
else else
@ -276,7 +276,12 @@ let pdf_of_json json =
| _ -> failwith "json bad obj") | _ -> failwith "json bad obj")
objs objs
in in
(*List.iter (fun (i, o) -> flprint (soi i); flprint "\n"; flprint (Pdfwrite.string_of_pdf o); flprint "\n") objects;*) (*List.
iter (fun (i, o) -> flprint (soi i); flprint "\n"; flprint (Pdfwrite.string_of_pdf o); flprint "\n") objects;*)
begin match Pdf.lookup_direct (Pdf.empty ()) "/CPDFJSONstreamdataincluded" !params with
| Some (Pdf.Boolean false) -> failwith "no stream data; cannot reconstruct PDF"
| _ -> ()
end;
let major = let major =
match Pdf.lookup_direct (Pdf.empty ()) "/CPDFJSONmajorpdfversion" !params with match Pdf.lookup_direct (Pdf.empty ()) "/CPDFJSONmajorpdfversion" !params with
Some (Pdf.Integer i) -> i | _ -> failwith "bad major version" Some (Pdf.Integer i) -> i | _ -> failwith "bad major version"