diff options
| -rw-r--r-- | include/mupdf/pdf/document.h | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-imp.h | 2 | ||||
| -rw-r--r-- | source/pdf/pdf-repair.c | 7 | ||||
| -rw-r--r-- | source/pdf/pdf-xref.c | 49 |
4 files changed, 53 insertions, 7 deletions
diff --git a/include/mupdf/pdf/document.h b/include/mupdf/pdf/document.h index bf5d61b8..231ab8b7 100644 --- a/include/mupdf/pdf/document.h +++ b/include/mupdf/pdf/document.h @@ -553,10 +553,12 @@ struct pdf_document_s int max_xref_len; int num_xref_sections; + int saved_num_xref_sections; int num_incremental_sections; int xref_base; int disallow_new_increments; pdf_xref *xref_sections; + pdf_xref *saved_xref_sections; int *xref_index; int freeze_updates; int has_xref_streams; diff --git a/source/pdf/pdf-imp.h b/source/pdf/pdf-imp.h index 0e3c459e..74010a2c 100644 --- a/source/pdf/pdf-imp.h +++ b/source/pdf/pdf-imp.h @@ -7,6 +7,8 @@ void pdf_dict_put_val_null(fz_context *ctx, pdf_obj *obj, int idx); +void pdf_forget_xref(fz_context *ctx, pdf_document *doc); + /* Private OCG functions. */ void pdf_read_ocg(fz_context *ctx, pdf_document *doc); diff --git a/source/pdf/pdf-repair.c b/source/pdf/pdf-repair.c index 04c968b3..a68800d0 100644 --- a/source/pdf/pdf-repair.c +++ b/source/pdf/pdf-repair.c @@ -1,4 +1,4 @@ -#include "mupdf/pdf.h" +#include "pdf-imp.h" /* Scan file for objects and reconstruct xref table */ @@ -324,8 +324,9 @@ pdf_repair_xref(fz_context *ctx, pdf_document *doc) doc->repair_attempted = 1; doc->dirty = 1; - /* Can't support incremental update after repair */ - doc->freeze_updates = 1; + doc->freeze_updates = 1; /* Can't support incremental update after repair */ + + pdf_forget_xref(ctx, doc); fz_seek(ctx, doc->file, 0, 0); diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c index 9c9d2fde..02616a15 100644 --- a/source/pdf/pdf-xref.c +++ b/source/pdf/pdf-xref.c @@ -20,14 +20,14 @@ static inline int iswhite(int ch) * xref tables */ -static void pdf_drop_xref_sections(fz_context *ctx, pdf_document *doc) +static void pdf_drop_xref_sections_imp(fz_context *ctx, pdf_document *doc, pdf_xref *xref_sections, int num_xref_sections) { pdf_unsaved_sig *usig; int x, e; - for (x = 0; x < doc->num_xref_sections; x++) + for (x = 0; x < num_xref_sections; x++) { - pdf_xref *xref = &doc->xref_sections[x]; + pdf_xref *xref = &xref_sections[x]; pdf_xref_subsec *sub = xref->subsec; while (sub != NULL) @@ -60,7 +60,16 @@ static void pdf_drop_xref_sections(fz_context *ctx, pdf_document *doc) } } - fz_free(ctx, doc->xref_sections); + fz_free(ctx, xref_sections); +} + +static void pdf_drop_xref_sections(fz_context *ctx, pdf_document *doc) +{ + pdf_drop_xref_sections_imp(ctx, doc, doc->saved_xref_sections, doc->saved_num_xref_sections); + pdf_drop_xref_sections_imp(ctx, doc, doc->xref_sections, doc->num_xref_sections); + + doc->saved_xref_sections = NULL; + doc->saved_num_xref_sections = 0; doc->xref_sections = NULL; doc->num_xref_sections = 0; doc->num_incremental_sections = 0; @@ -536,6 +545,36 @@ void pdf_replace_xref(fz_context *ctx, pdf_document *doc, pdf_xref_entry *entrie } } +void pdf_forget_xref(fz_context *ctx, pdf_document *doc) +{ + pdf_obj *trailer = pdf_keep_obj(ctx, pdf_trailer(ctx, doc)); + + if (doc->saved_xref_sections) + pdf_drop_xref_sections_imp(ctx, doc, doc->saved_xref_sections, doc->saved_num_xref_sections); + + doc->saved_xref_sections = doc->xref_sections; + doc->saved_num_xref_sections = doc->num_xref_sections; + + doc->startxref = 0; + doc->num_xref_sections = 0; + doc->num_incremental_sections = 0; + doc->xref_base = 0; + doc->disallow_new_increments = 0; + + fz_try(ctx) + { + pdf_get_populating_xref_entry(ctx, doc, 0); + } + fz_catch(ctx) + { + pdf_drop_obj(ctx, trailer); + fz_rethrow(ctx); + } + + /* Set the trailer of the final xref section. */ + doc->xref_sections[0].trailer = trailer; +} + /* * magic version tag and startxref */ @@ -2664,6 +2703,7 @@ pdf_document *pdf_create_document(fz_context *ctx) doc->xref_base = 0; doc->disallow_new_increments = 0; pdf_get_populating_xref_entry(ctx, doc, 0); + trailer = pdf_new_dict(ctx, doc, 2); pdf_dict_put_drop(ctx, trailer, PDF_NAME_Size, pdf_new_int(ctx, doc, 3)); o = root = pdf_new_dict(ctx, doc, 2); @@ -2678,6 +2718,7 @@ pdf_document *pdf_create_document(fz_context *ctx) pdf_dict_put_drop(ctx, pages, PDF_NAME_Type, PDF_NAME_Pages); pdf_dict_put_drop(ctx, pages, PDF_NAME_Count, pdf_new_int(ctx, doc, 0)); pdf_dict_put_drop(ctx, pages, PDF_NAME_Kids, pdf_new_array(ctx, doc, 1)); + /* Set the trailer of the final xref section. */ doc->xref_sections[0].trailer = trailer; } |