diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2011-04-10 02:35:43 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2011-04-10 03:29:04 +0200 |
| commit | b94dfb21d31dabda1095a66c809904ff934dd831 (patch) | |
| tree | cc937f69fe3d7e8d5ab8973f3a71dd5e322c989d /pdf/pdf_stream.c | |
| parent | b83d1cfdd14cde26eb7d6ce3b741f9e35e5168a0 (diff) | |
| download | mupdf-b94dfb21d31dabda1095a66c809904ff934dd831.tar.xz | |
Make crypt struct opaque.
Diffstat (limited to 'pdf/pdf_stream.c')
| -rw-r--r-- | pdf/pdf_stream.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pdf/pdf_stream.c b/pdf/pdf_stream.c index 79b39d07..c2dd8578 100644 --- a/pdf/pdf_stream.c +++ b/pdf/pdf_stream.c @@ -113,7 +113,6 @@ build_filter(fz_stream *chain, pdf_xref * xref, fz_obj * f, fz_obj * p, int num, else if (!strcmp(s, "Crypt")) { - pdf_crypt_filter cf; fz_obj *name; if (!xref->crypt) @@ -123,18 +122,8 @@ build_filter(fz_stream *chain, pdf_xref * xref, fz_obj * f, fz_obj * p, int num, } name = fz_dict_gets(p, "Name"); - if (fz_is_name(name) && strcmp(fz_to_name(name), "Identity") != 0) - { - fz_obj *obj = fz_dict_get(xref->crypt->cf, name); - if (fz_is_dict(obj)) - { - error = pdf_parse_crypt_filter(&cf, obj, xref->crypt->length); - if (error) - fz_catch(error, "cannot parse crypt filter (%d %d R)", fz_to_num(obj), fz_to_gen(obj)); - else - return pdf_open_crypt(chain, xref->crypt, &cf, num, gen); - } - } + if (fz_is_name(name)) + return pdf_open_crypt_with_filter(chain, xref->crypt, fz_to_name(name), num, gen); return chain; } @@ -184,7 +173,7 @@ pdf_open_raw_filter(fz_stream *chain, pdf_xref *xref, fz_obj *stmobj, int num, i hascrypt = pdf_stream_has_crypt(stmobj); if (xref->crypt && !hascrypt) - chain = pdf_open_crypt(chain, xref->crypt, &xref->crypt->stmf, num, gen); + chain = pdf_open_crypt(chain, xref->crypt, num, gen); return chain; } |