diff --git a/cpdfjson.ml b/cpdfjson.ml index d7e57bc..a343048 100644 --- a/cpdfjson.ml +++ b/cpdfjson.ml @@ -202,17 +202,11 @@ let rec json_of_object pdf fcs no_stream_data = function | _ -> ()) elts; `Assoc (map (fun (k, v) -> (k, json_of_object pdf fcs no_stream_data v)) elts) - | P.Stream ({contents = (P.Dictionary dict as d, stream)} as mut) as thestream -> + | P.Stream ({contents = (P.Dictionary dict, stream)} as mut) as thestream -> P.getstream thestream; let str = - begin match P.lookup_direct pdf "/FunctionType" d with - | Some _ -> - Pdfcodec.decode_pdfstream_until_unknown pdf thestream; - begin match !mut with (_, P.Got b) -> Pdfio.string_of_bytes b | _ -> "failure: decomp" end - | None -> - if no_stream_data then "<>" else - match stream with P.Got b -> Pdfio.string_of_bytes b | P.ToGet _ -> "failure: toget" - end + if no_stream_data then "<>" else + match !mut with (_, P.Got b) -> Pdfio.string_of_bytes b | _ -> error "failure: toget" in json_of_object pdf fcs no_stream_data (P.Dictionary [("S", P.Array [P.Dictionary dict; P.String str])]) | P.Stream _ -> error "error: stream with not-a-dictionary"