diff options
Diffstat (limited to 'pdf')
| -rw-r--r-- | pdf/mupdf-internal.h | 2 | ||||
| -rw-r--r-- | pdf/pdf_font.c | 3 | ||||
| -rw-r--r-- | pdf/pdf_interpret.c | 2 | ||||
| -rw-r--r-- | pdf/pdf_repair.c | 1 | ||||
| -rw-r--r-- | pdf/pdf_write.c | 8 |
5 files changed, 12 insertions, 4 deletions
diff --git a/pdf/mupdf-internal.h b/pdf/mupdf-internal.h index 3f3d0fb5..839f30f4 100644 --- a/pdf/mupdf-internal.h +++ b/pdf/mupdf-internal.h @@ -600,7 +600,7 @@ typedef struct pdf_js_event_s int rc; } pdf_js_event; -int pdf_js_suported(); +int pdf_js_supported(); pdf_js *pdf_new_js(pdf_document *doc); void pdf_drop_js(pdf_js *js); void pdf_js_load_document_level(pdf_js *js); diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c index 33a1a651..6879d12b 100644 --- a/pdf/pdf_font.c +++ b/pdf/pdf_font.c @@ -260,7 +260,8 @@ pdf_load_system_font(fz_context *ctx, pdf_font_desc *fontdesc, char *fontname, c pdf_load_substitute_cjk_font(ctx, fontdesc, fontname, PDF_ROS_KOREA, serif); else { - fz_warn(ctx, "unknown cid collection: %s", collection); + if (strcmp(collection, "Adobe-Identity") != 0) + fz_warn(ctx, "unknown cid collection: %s", collection); pdf_load_substitute_font(ctx, fontdesc, fontname, mono, serif, bold, italic); } } diff --git a/pdf/pdf_interpret.c b/pdf/pdf_interpret.c index 1acef7df..6a2eab04 100644 --- a/pdf/pdf_interpret.c +++ b/pdf/pdf_interpret.c @@ -28,7 +28,7 @@ struct pdf_material_s pdf_pattern *pattern; fz_shade *shade; float alpha; - float v[32]; + float v[FZ_MAX_COLORS]; }; struct pdf_gstate_s diff --git a/pdf/pdf_repair.c b/pdf/pdf_repair.c index dac02731..44d69b99 100644 --- a/pdf/pdf_repair.c +++ b/pdf/pdf_repair.c @@ -419,7 +419,6 @@ pdf_repair_xref(pdf_document *xref, pdf_lexbuf *buf) pdf_drop_obj(dict); } - } xref->table[0].type = 'f'; diff --git a/pdf/pdf_write.c b/pdf/pdf_write.c index a8b56964..98f0dd2e 100644 --- a/pdf/pdf_write.c +++ b/pdf/pdf_write.c @@ -1737,6 +1737,14 @@ dowriteobject(pdf_document *xref, pdf_write_options *opts, int num, int pass) if (xref->table[num].type == 'o') opts->gen_list[num] = 0; + /* If we are renumbering, then make sure all generation numbers are + * zero (except object 0 which must be free, and have a gen number of + * 65535). Changing the generation numbers (and indeed object numbers) + * will break encryption - so only do this if we are renumbering + * anyway. */ + if (opts->do_garbage >= 2) + opts->gen_list[num] = (num == 0 ? 65535 : 0); + if (opts->do_garbage && !opts->use_list[num]) return; |