diff options
Diffstat (limited to 'source/pdf/pdf-clean.c')
| -rw-r--r-- | source/pdf/pdf-clean.c | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/source/pdf/pdf-clean.c b/source/pdf/pdf-clean.c index 7fe0d6fe..0c9cb974 100644 --- a/source/pdf/pdf-clean.c +++ b/source/pdf/pdf-clean.c @@ -2,7 +2,9 @@ #include "mupdf/pdf.h" static void -pdf_clean_stream_object(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf_obj *orig_res, fz_cookie *cookie, int own_res, int ascii, pdf_text_filter_fn *text_filter, pdf_after_text_object_fn *after_text, void *arg) +pdf_clean_stream_object(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf_obj *orig_res, fz_cookie *cookie, int own_res, + pdf_text_filter_fn *text_filter, pdf_after_text_object_fn *after_text, void *arg, + int sanitize, int ascii) { pdf_processor *proc_buffer = NULL; pdf_processor *proc_filter = NULL; @@ -59,7 +61,7 @@ pdf_clean_stream_object(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf_ob } static void -pdf_clean_type3(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf_obj *orig_res, fz_cookie *cookie, int ascii) +pdf_clean_type3(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf_obj *orig_res, fz_cookie *cookie, int sanitize, int ascii) { pdf_processor *proc_buffer = NULL; pdf_processor *proc_filter = NULL; @@ -91,10 +93,16 @@ pdf_clean_type3(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf_obj *orig_ fz_try(ctx) { proc_buffer = pdf_new_buffer_processor(ctx, buffer, ascii); - proc_filter = pdf_new_filter_processor(ctx, doc, proc_buffer, orig_res, res); - - pdf_process_contents(ctx, proc_filter, doc, orig_res, val, cookie); - pdf_close_processor(ctx, proc_filter); + if (sanitize) + { + proc_filter = pdf_new_filter_processor(ctx, doc, proc_buffer, orig_res, res); + pdf_process_contents(ctx, proc_filter, doc, orig_res, val, cookie); + pdf_close_processor(ctx, proc_filter); + } + else + { + pdf_process_contents(ctx, proc_filter, doc, orig_res, val, cookie); + } pdf_close_processor(ctx, proc_buffer); pdf_update_stream(ctx, doc, val, buffer, 0); @@ -127,12 +135,14 @@ pdf_clean_type3(fz_context *ctx, pdf_document *doc, pdf_obj *obj, pdf_obj *orig_ } } -void pdf_clean_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_cookie *cookie, pdf_page_contents_process_fn *proc_fn, void *arg, int ascii) +void pdf_clean_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_cookie *cookie, pdf_page_contents_process_fn *proc_fn, void *arg, int sanitize, int ascii) { - pdf_filter_page_contents(ctx, doc, page, cookie, proc_fn, NULL, NULL, arg, ascii); + pdf_filter_page_contents(ctx, doc, page, cookie, proc_fn, NULL, NULL, arg, sanitize, ascii); } -void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_cookie *cookie, pdf_page_contents_process_fn *proc_fn, pdf_text_filter_fn *text_filter, pdf_after_text_object_fn *after_text, void *proc_arg, int ascii) +void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page, fz_cookie *cookie, + pdf_page_contents_process_fn *proc_fn, pdf_text_filter_fn *text_filter, pdf_after_text_object_fn *after_text, void *proc_arg, + int sanitize, int ascii) { pdf_processor *proc_buffer = NULL; pdf_processor *proc_filter = NULL; @@ -162,10 +172,17 @@ void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page resources = pdf_page_resources(ctx, page); proc_buffer = pdf_new_buffer_processor(ctx, buffer, ascii); - proc_filter = pdf_new_filter_processor_with_text_filter(ctx, doc, proc_buffer, resources, res, text_filter, after_text, proc_arg); + if (sanitize) + { + proc_filter = pdf_new_filter_processor_with_text_filter(ctx, doc, proc_buffer, resources, res, text_filter, after_text, proc_arg); - pdf_process_contents(ctx, proc_filter, doc, resources, contents, cookie); - pdf_close_processor(ctx, proc_filter); + pdf_process_contents(ctx, proc_filter, doc, resources, contents, cookie); + pdf_close_processor(ctx, proc_filter); + } + else + { + pdf_process_contents(ctx, proc_buffer, doc, resources, contents, cookie); + } pdf_close_processor(ctx, proc_buffer); /* Deal with page content stream. */ @@ -207,7 +224,7 @@ void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page if (!o) continue; /* Transparency group XObject */ - pdf_clean_stream_object(ctx, doc, o, resources, cookie, 1, ascii, text_filter, after_text, proc_arg); + pdf_clean_stream_object(ctx, doc, o, resources, cookie, 1, text_filter, after_text, proc_arg, sanitize, ascii); } } @@ -223,7 +240,7 @@ void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page if (!pat) continue; if (pdf_to_int(ctx, pdf_dict_get(ctx, pat, PDF_NAME_PatternType)) == 1) - pdf_clean_stream_object(ctx, doc, pat, resources, cookie, 0, ascii, text_filter, after_text, proc_arg); + pdf_clean_stream_object(ctx, doc, pat, resources, cookie, 0, text_filter, after_text, proc_arg, sanitize, ascii); } } @@ -239,7 +256,7 @@ void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page if (!xobj) continue; if (pdf_name_eq(ctx, PDF_NAME_Form, pdf_dict_get(ctx, xobj, PDF_NAME_Subtype))) - pdf_clean_stream_object(ctx, doc, xobj, resources, cookie, 1, ascii, text_filter, after_text, proc_arg); + pdf_clean_stream_object(ctx, doc, xobj, resources, cookie, 1, text_filter, after_text, proc_arg, sanitize, ascii); } } @@ -255,7 +272,7 @@ void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page if (!o) continue; if (pdf_name_eq(ctx, PDF_NAME_Type3, pdf_dict_get(ctx, o, PDF_NAME_Subtype))) - pdf_clean_type3(ctx, doc, o, resources, cookie, ascii); + pdf_clean_type3(ctx, doc, o, resources, cookie, sanitize, ascii); } } @@ -290,13 +307,13 @@ void pdf_filter_page_contents(fz_context *ctx, pdf_document *doc, pdf_page *page } } -void pdf_clean_annot_contents(fz_context *ctx, pdf_document *doc, pdf_annot *annot, fz_cookie *cookie, pdf_page_contents_process_fn *proc_fn, void *proc_arg, int ascii) +void pdf_clean_annot_contents(fz_context *ctx, pdf_document *doc, pdf_annot *annot, fz_cookie *cookie, pdf_page_contents_process_fn *proc_fn, void *proc_arg, int sanitize, int ascii) { - pdf_filter_annot_contents(ctx, doc, annot, cookie, proc_fn, NULL, NULL, proc_arg, ascii); + pdf_filter_annot_contents(ctx, doc, annot, cookie, proc_fn, NULL, NULL, proc_arg, sanitize, ascii); } void pdf_filter_annot_contents(fz_context *ctx, pdf_document *doc, pdf_annot *annot, fz_cookie *cookie, - pdf_page_contents_process_fn *proc, pdf_text_filter_fn *text_filter, pdf_after_text_object_fn *after_text, void *arg, int ascii) + pdf_page_contents_process_fn *proc, pdf_text_filter_fn *text_filter, pdf_after_text_object_fn *after_text, void *arg, int sanitize, int ascii) { pdf_obj *ap; int i, n; @@ -313,6 +330,6 @@ void pdf_filter_annot_contents(fz_context *ctx, pdf_document *doc, pdf_annot *an if (v == NULL) continue; - pdf_clean_stream_object(ctx, doc, v, NULL, cookie, 1, 1, text_filter, after_text, arg); + pdf_clean_stream_object(ctx, doc, v, NULL, cookie, 1, text_filter, after_text, arg, sanitize, ascii); } } |