diff options
Diffstat (limited to 'source/pdf/pdf-write.c')
| -rw-r--r-- | source/pdf/pdf-write.c | 244 |
1 files changed, 122 insertions, 122 deletions
diff --git a/source/pdf/pdf-write.c b/source/pdf/pdf-write.c index b4d51949..24e6d9e4 100644 --- a/source/pdf/pdf-write.c +++ b/source/pdf/pdf-write.c @@ -538,12 +538,12 @@ static pdf_obj *markref(fz_context *ctx, pdf_document *doc, pdf_write_state *opt { if (pdf_obj_num_is_stream(ctx, doc, num)) { - pdf_obj *len = pdf_dict_get(ctx, obj, PDF_NAME_Length); + pdf_obj *len = pdf_dict_get(ctx, obj, PDF_NAME(Length)); if (pdf_is_indirect(ctx, len)) { opts->use_list[pdf_to_num(ctx, len)] = 0; len = pdf_resolve_indirect(ctx, len); - pdf_dict_put(ctx, obj, PDF_NAME_Length, len); + pdf_dict_put(ctx, obj, PDF_NAME(Length), len); } } } @@ -621,7 +621,7 @@ static int markobj(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, pd { DEBUGGING_MARKING(indent(); printf("ARRAY[%d/%d]\n", i, n)); if (markobj(ctx, doc, opts, pdf_array_get(ctx, obj, i))) - pdf_array_put(ctx, obj, i, PDF_OBJ_NULL); + pdf_array_put(ctx, obj, i, PDF_NULL); } } @@ -1021,7 +1021,7 @@ mark_pages(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, pdf_obj *v { if (pdf_is_dict(ctx, val)) { - if (pdf_name_eq(ctx, PDF_NAME_Page, pdf_dict_get(ctx, val, PDF_NAME_Type))) + if (pdf_name_eq(ctx, PDF_NAME(Page), pdf_dict_get(ctx, val, PDF_NAME(Type)))) { int num = pdf_to_num(ctx, val); pdf_unmark_obj(ctx, val); @@ -1039,7 +1039,7 @@ mark_pages(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, pdf_obj *v pdf_obj *key = pdf_dict_get_key(ctx, val, i); pdf_obj *obj = pdf_dict_get_val(ctx, val, i); - if (pdf_name_eq(ctx, PDF_NAME_Kids, key)) + if (pdf_name_eq(ctx, PDF_NAME(Kids), key)) pagenum = mark_pages(ctx, doc, opts, obj, pagenum); else mark_all(ctx, doc, opts, obj, USE_CATALOGUE, -1); @@ -1099,18 +1099,18 @@ mark_root(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, pdf_obj *di pdf_obj *key = pdf_dict_get_key(ctx, dict, i); pdf_obj *val = pdf_dict_get_val(ctx, dict, i); - if (pdf_name_eq(ctx, PDF_NAME_Pages, key)) + if (pdf_name_eq(ctx, PDF_NAME(Pages), key)) opts->page_count = mark_pages(ctx, doc, opts, val, 0); - else if (pdf_name_eq(ctx, PDF_NAME_Names, key)) + else if (pdf_name_eq(ctx, PDF_NAME(Names), key)) mark_all(ctx, doc, opts, val, USE_OTHER_OBJECTS, -1); - else if (pdf_name_eq(ctx, PDF_NAME_Dests, key)) + else if (pdf_name_eq(ctx, PDF_NAME(Dests), key)) mark_all(ctx, doc, opts, val, USE_OTHER_OBJECTS, -1); - else if (pdf_name_eq(ctx, PDF_NAME_Outlines, key)) + else if (pdf_name_eq(ctx, PDF_NAME(Outlines), key)) { int section; /* Look at PageMode to decide whether to * USE_OTHER_OBJECTS or USE_PAGE1 here. */ - if (pdf_name_eq(ctx, pdf_dict_get(ctx, dict, PDF_NAME_PageMode), PDF_NAME_UseOutlines)) + if (pdf_name_eq(ctx, pdf_dict_get(ctx, dict, PDF_NAME(PageMode)), PDF_NAME(UseOutlines))) section = USE_PAGE1; else section = USE_OTHER_OBJECTS; @@ -1145,7 +1145,7 @@ mark_trailer(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, pdf_obj pdf_obj *key = pdf_dict_get_key(ctx, dict, i); pdf_obj *val = pdf_dict_get_val(ctx, dict, i); - if (pdf_name_eq(ctx, PDF_NAME_Root, key)) + if (pdf_name_eq(ctx, PDF_NAME(Root), key)) mark_root(ctx, doc, opts, val); else mark_all(ctx, doc, opts, val, USE_CATALOGUE, -1); @@ -1187,23 +1187,23 @@ add_linearization_objs(fz_context *ctx, pdf_document *doc, pdf_write_state *opts opts->renumber_map[params_num] = params_num; opts->rev_renumber_map[params_num] = params_num; opts->gen_list[params_num] = 0; - pdf_dict_put_real(ctx, params_obj, PDF_NAME_Linearized, 1.0f); + pdf_dict_put_real(ctx, params_obj, PDF_NAME(Linearized), 1.0f); opts->linear_l = pdf_new_int(ctx, doc, INT_MIN); - pdf_dict_put(ctx, params_obj, PDF_NAME_L, opts->linear_l); + pdf_dict_put(ctx, params_obj, PDF_NAME(L), opts->linear_l); opts->linear_h0 = pdf_new_int(ctx, doc, INT_MIN); o = pdf_new_array(ctx, doc, 2); - pdf_dict_put_drop(ctx, params_obj, PDF_NAME_H, o); + pdf_dict_put_drop(ctx, params_obj, PDF_NAME(H), o); pdf_array_push(ctx, o, opts->linear_h0); opts->linear_h1 = pdf_new_int(ctx, doc, INT_MIN); pdf_array_push(ctx, o, opts->linear_h1); opts->linear_o = pdf_new_int(ctx, doc, INT_MIN); - pdf_dict_put(ctx, params_obj, PDF_NAME_O, opts->linear_o); + pdf_dict_put(ctx, params_obj, PDF_NAME(O), opts->linear_o); opts->linear_e = pdf_new_int(ctx, doc, INT_MIN); - pdf_dict_put(ctx, params_obj, PDF_NAME_E, opts->linear_e); + pdf_dict_put(ctx, params_obj, PDF_NAME(E), opts->linear_e); opts->linear_n = pdf_new_int(ctx, doc, INT_MIN); - pdf_dict_put(ctx, params_obj, PDF_NAME_N, opts->linear_n); + pdf_dict_put(ctx, params_obj, PDF_NAME(N), opts->linear_n); opts->linear_t = pdf_new_int(ctx, doc, INT_MIN); - pdf_dict_put(ctx, params_obj, PDF_NAME_T, opts->linear_t); + pdf_dict_put(ctx, params_obj, PDF_NAME(T), opts->linear_t); /* Primary hint stream */ hint_obj = pdf_new_dict(ctx, doc, 10); @@ -1214,9 +1214,9 @@ add_linearization_objs(fz_context *ctx, pdf_document *doc, pdf_write_state *opts opts->renumber_map[hint_num] = hint_num; opts->rev_renumber_map[hint_num] = hint_num; opts->gen_list[hint_num] = 0; - pdf_dict_put_int(ctx, hint_obj, PDF_NAME_P, 0); + pdf_dict_put_int(ctx, hint_obj, PDF_NAME(P), 0); opts->hints_s = pdf_new_int(ctx, doc, INT_MIN); - pdf_dict_put(ctx, hint_obj, PDF_NAME_S, opts->hints_s); + pdf_dict_put(ctx, hint_obj, PDF_NAME(S), opts->hints_s); /* FIXME: Do we have thumbnails? Do a T entry */ /* FIXME: Do we have outlines? Do an O entry */ /* FIXME: Do we have article threads? Do an A entry */ @@ -1225,9 +1225,9 @@ add_linearization_objs(fz_context *ctx, pdf_document *doc, pdf_write_state *opts /* FIXME: Do we have document information? Do an I entry */ /* FIXME: Do we have logical structure hierarchy? Do a C entry */ /* FIXME: Do L, Page Label hint table */ - pdf_dict_put(ctx, hint_obj, PDF_NAME_Filter, PDF_NAME_FlateDecode); + pdf_dict_put(ctx, hint_obj, PDF_NAME(Filter), PDF_NAME(FlateDecode)); opts->hints_length = pdf_new_int(ctx, doc, INT_MIN); - pdf_dict_put(ctx, hint_obj, PDF_NAME_Length, opts->hints_length); + pdf_dict_put(ctx, hint_obj, PDF_NAME(Length), opts->hints_length); pdf_get_xref_entry(ctx, doc, hint_num)->stm_ofs = -1; } fz_always(ctx) @@ -1294,22 +1294,22 @@ lpr_inherit_res(fz_context *ctx, pdf_obj *node, int depth, pdf_obj *dict) { pdf_obj *o; - node = pdf_dict_get(ctx, node, PDF_NAME_Parent); + node = pdf_dict_get(ctx, node, PDF_NAME(Parent)); depth--; if (!node || depth < 0) break; - o = pdf_dict_get(ctx, node, PDF_NAME_Resources); + o = pdf_dict_get(ctx, node, PDF_NAME(Resources)); if (o) { - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_ExtGState); - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_ColorSpace); - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_Pattern); - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_Shading); - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_XObject); - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_Font); - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_ProcSet); - lpr_inherit_res_contents(ctx, dict, o, PDF_NAME_Properties); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(ExtGState)); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(ColorSpace)); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(Pattern)); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(Shading)); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(XObject)); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(Font)); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(ProcSet)); + lpr_inherit_res_contents(ctx, dict, o, PDF_NAME(Properties)); } } } @@ -1323,7 +1323,7 @@ lpr_inherit(fz_context *ctx, pdf_obj *node, char *text, int depth) if (o) return pdf_resolve_indirect(ctx, o); - node = pdf_dict_get(ctx, node, PDF_NAME_Parent); + node = pdf_dict_get(ctx, node, PDF_NAME(Parent)); depth--; } while (depth >= 0 && node); @@ -1345,53 +1345,53 @@ lpr(fz_context *ctx, pdf_document *doc, pdf_obj *node, int depth, int page) fz_try(ctx) { - if (pdf_name_eq(ctx, PDF_NAME_Page, pdf_dict_get(ctx, node, PDF_NAME_Type))) + if (pdf_name_eq(ctx, PDF_NAME(Page), pdf_dict_get(ctx, node, PDF_NAME(Type)))) { pdf_obj *r; /* r is deliberately not cleaned up */ /* Copy resources down to the child */ - o = pdf_keep_obj(ctx, pdf_dict_get(ctx, node, PDF_NAME_Resources)); + o = pdf_keep_obj(ctx, pdf_dict_get(ctx, node, PDF_NAME(Resources))); if (!o) { o = pdf_keep_obj(ctx, pdf_new_dict(ctx, doc, 2)); - pdf_dict_put(ctx, node, PDF_NAME_Resources, o); + pdf_dict_put(ctx, node, PDF_NAME(Resources), o); } lpr_inherit_res(ctx, node, depth, o); r = lpr_inherit(ctx, node, "MediaBox", depth); if (r) - pdf_dict_put(ctx, node, PDF_NAME_MediaBox, r); + pdf_dict_put(ctx, node, PDF_NAME(MediaBox), r); r = lpr_inherit(ctx, node, "CropBox", depth); if (r) - pdf_dict_put(ctx, node, PDF_NAME_CropBox, r); + pdf_dict_put(ctx, node, PDF_NAME(CropBox), r); r = lpr_inherit(ctx, node, "BleedBox", depth); if (r) - pdf_dict_put(ctx, node, PDF_NAME_BleedBox, r); + pdf_dict_put(ctx, node, PDF_NAME(BleedBox), r); r = lpr_inherit(ctx, node, "TrimBox", depth); if (r) - pdf_dict_put(ctx, node, PDF_NAME_TrimBox, r); + pdf_dict_put(ctx, node, PDF_NAME(TrimBox), r); r = lpr_inherit(ctx, node, "ArtBox", depth); if (r) - pdf_dict_put(ctx, node, PDF_NAME_ArtBox, r); + pdf_dict_put(ctx, node, PDF_NAME(ArtBox), r); r = lpr_inherit(ctx, node, "Rotate", depth); if (r) - pdf_dict_put(ctx, node, PDF_NAME_Rotate, r); + pdf_dict_put(ctx, node, PDF_NAME(Rotate), r); page++; } else { - kids = pdf_dict_get(ctx, node, PDF_NAME_Kids); + kids = pdf_dict_get(ctx, node, PDF_NAME(Kids)); n = pdf_array_len(ctx, kids); for(i = 0; i < n; i++) { page = lpr(ctx, doc, pdf_array_get(ctx, kids, i), depth+1, page); } - pdf_dict_del(ctx, node, PDF_NAME_Resources); - pdf_dict_del(ctx, node, PDF_NAME_MediaBox); - pdf_dict_del(ctx, node, PDF_NAME_CropBox); - pdf_dict_del(ctx, node, PDF_NAME_BleedBox); - pdf_dict_del(ctx, node, PDF_NAME_TrimBox); - pdf_dict_del(ctx, node, PDF_NAME_ArtBox); - pdf_dict_del(ctx, node, PDF_NAME_Rotate); + pdf_dict_del(ctx, node, PDF_NAME(Resources)); + pdf_dict_del(ctx, node, PDF_NAME(MediaBox)); + pdf_dict_del(ctx, node, PDF_NAME(CropBox)); + pdf_dict_del(ctx, node, PDF_NAME(BleedBox)); + pdf_dict_del(ctx, node, PDF_NAME(TrimBox)); + pdf_dict_del(ctx, node, PDF_NAME(ArtBox)); + pdf_dict_del(ctx, node, PDF_NAME(Rotate)); } } fz_always(ctx) @@ -1414,7 +1414,7 @@ pdf_localise_page_resources(fz_context *ctx, pdf_document *doc) if (doc->resources_localised) return; - lpr(ctx, doc, pdf_dict_getl(ctx, pdf_trailer(ctx, doc), PDF_NAME_Root, PDF_NAME_Pages, NULL), 0, 0); + lpr(ctx, doc, pdf_dict_getl(ctx, pdf_trailer(ctx, doc), PDF_NAME(Root), PDF_NAME(Pages), NULL), 0, 0); doc->resources_localised = 1; } @@ -1590,8 +1590,8 @@ static void addhexfilter(fz_context *ctx, pdf_document *doc, pdf_obj *dict) pdf_obj *f, *dp, *newf, *newdp; newf = newdp = NULL; - f = pdf_dict_get(ctx, dict, PDF_NAME_Filter); - dp = pdf_dict_get(ctx, dict, PDF_NAME_DecodeParms); + f = pdf_dict_get(ctx, dict, PDF_NAME(Filter)); + dp = pdf_dict_get(ctx, dict, PDF_NAME(DecodeParms)); fz_var(newf); fz_var(newdp); @@ -1601,29 +1601,29 @@ static void addhexfilter(fz_context *ctx, pdf_document *doc, pdf_obj *dict) if (pdf_is_name(ctx, f)) { newf = pdf_new_array(ctx, doc, 2); - pdf_array_push(ctx, newf, PDF_NAME_ASCIIHexDecode); + pdf_array_push(ctx, newf, PDF_NAME(ASCIIHexDecode)); pdf_array_push(ctx, newf, f); f = newf; if (pdf_is_dict(ctx, dp)) { newdp = pdf_new_array(ctx, doc, 2); - pdf_array_push(ctx, newdp, PDF_OBJ_NULL); + pdf_array_push(ctx, newdp, PDF_NULL); pdf_array_push(ctx, newdp, dp); dp = newdp; } } else if (pdf_is_array(ctx, f)) { - pdf_array_insert(ctx, f, PDF_NAME_ASCIIHexDecode, 0); + pdf_array_insert(ctx, f, PDF_NAME(ASCIIHexDecode), 0); if (pdf_is_array(ctx, dp)) - pdf_array_insert(ctx, dp, PDF_OBJ_NULL, 0); + pdf_array_insert(ctx, dp, PDF_NULL, 0); } else - f = PDF_NAME_ASCIIHexDecode; + f = PDF_NAME(ASCIIHexDecode); - pdf_dict_put(ctx, dict, PDF_NAME_Filter, f); + pdf_dict_put(ctx, dict, PDF_NAME(Filter), f); if (dp) - pdf_dict_put(ctx, dict, PDF_NAME_DecodeParms, dp); + pdf_dict_put(ctx, dict, PDF_NAME(DecodeParms), dp); } fz_always(ctx) { @@ -1678,7 +1678,7 @@ static void copystream(fz_context *ctx, pdf_document *doc, pdf_write_state *opts obj = pdf_copy_dict(ctx, obj_orig); len = fz_buffer_storage(ctx, buf, &data); - if (do_deflate && !pdf_dict_get(ctx, obj, PDF_NAME_Filter)) + if (do_deflate && !pdf_dict_get(ctx, obj, PDF_NAME(Filter))) { size_t clen; unsigned char *cdata; @@ -1693,7 +1693,7 @@ static void copystream(fz_context *ctx, pdf_document *doc, pdf_write_state *opts { len = clen; data = cdata; - pdf_dict_put(ctx, obj, PDF_NAME_Filter, PDF_NAME_FlateDecode); + pdf_dict_put(ctx, obj, PDF_NAME(Filter), PDF_NAME(FlateDecode)); fz_drop_buffer(ctx, buf); buf = tmp; } @@ -1710,7 +1710,7 @@ static void copystream(fz_context *ctx, pdf_document *doc, pdf_write_state *opts } newlen = pdf_new_int(ctx, doc, pdf_encrypted_len(ctx, doc->crypt, num, gen, (int)len)); - pdf_dict_put_drop(ctx, obj, PDF_NAME_Length, newlen); + pdf_dict_put_drop(ctx, obj, PDF_NAME(Length), newlen); fz_write_printf(ctx, opts->out, "%d %d obj\n", num, gen); pdf_print_encrypted_obj(ctx, opts->out, obj, opts->do_tight, doc->crypt, num, gen); @@ -1735,8 +1735,8 @@ static void expandstream(fz_context *ctx, pdf_document *doc, pdf_write_state *op (*opts->errors)++; obj = pdf_copy_dict(ctx, obj_orig); - pdf_dict_del(ctx, obj, PDF_NAME_Filter); - pdf_dict_del(ctx, obj, PDF_NAME_DecodeParms); + pdf_dict_del(ctx, obj, PDF_NAME(Filter)); + pdf_dict_del(ctx, obj, PDF_NAME(DecodeParms)); len = fz_buffer_storage(ctx, buf, &data); if (do_deflate) @@ -1754,7 +1754,7 @@ static void expandstream(fz_context *ctx, pdf_document *doc, pdf_write_state *op { len = clen; data = cdata; - pdf_dict_put(ctx, obj, PDF_NAME_Filter, PDF_NAME_FlateDecode); + pdf_dict_put(ctx, obj, PDF_NAME(Filter), PDF_NAME(FlateDecode)); fz_drop_buffer(ctx, buf); buf = tmp; } @@ -1770,7 +1770,7 @@ static void expandstream(fz_context *ctx, pdf_document *doc, pdf_write_state *op addhexfilter(ctx, doc, obj); } - pdf_dict_put_int(ctx, obj, PDF_NAME_Length, len); + pdf_dict_put_int(ctx, obj, PDF_NAME(Length), len); fz_write_printf(ctx, opts->out, "%d %d obj\n", num, gen); pdf_print_encrypted_obj(ctx, opts->out, obj, opts->do_tight, doc->crypt, num, gen); @@ -1813,12 +1813,12 @@ static int filter_implies_image(fz_context *ctx, pdf_obj *o) static int is_image_stream(fz_context *ctx, pdf_obj *obj) { pdf_obj *o; - if ((o = pdf_dict_get(ctx, obj, PDF_NAME_Type), pdf_name_eq(ctx, o, PDF_NAME_XObject))) - if ((o = pdf_dict_get(ctx, obj, PDF_NAME_Subtype), pdf_name_eq(ctx, o, PDF_NAME_Image))) + if ((o = pdf_dict_get(ctx, obj, PDF_NAME(Type)), pdf_name_eq(ctx, o, PDF_NAME(XObject)))) + if ((o = pdf_dict_get(ctx, obj, PDF_NAME(Subtype)), pdf_name_eq(ctx, o, PDF_NAME(Image)))) return 1; - if (o = pdf_dict_get(ctx, obj, PDF_NAME_Filter), filter_implies_image(ctx, o)) + if (o = pdf_dict_get(ctx, obj, PDF_NAME(Filter)), filter_implies_image(ctx, o)) return 1; - if (pdf_dict_get(ctx, obj, PDF_NAME_Width) != NULL && pdf_dict_get(ctx, obj, PDF_NAME_Height) != NULL) + if (pdf_dict_get(ctx, obj, PDF_NAME(Width)) != NULL && pdf_dict_get(ctx, obj, PDF_NAME(Height)) != NULL) return 1; return 0; } @@ -1826,27 +1826,27 @@ static int is_image_stream(fz_context *ctx, pdf_obj *obj) static int is_font_stream(fz_context *ctx, pdf_obj *obj) { pdf_obj *o; - if (o = pdf_dict_get(ctx, obj, PDF_NAME_Type), pdf_name_eq(ctx, o, PDF_NAME_Font)) + if (o = pdf_dict_get(ctx, obj, PDF_NAME(Type)), pdf_name_eq(ctx, o, PDF_NAME(Font))) return 1; - if (o = pdf_dict_get(ctx, obj, PDF_NAME_Type), pdf_name_eq(ctx, o, PDF_NAME_FontDescriptor)) + if (o = pdf_dict_get(ctx, obj, PDF_NAME(Type)), pdf_name_eq(ctx, o, PDF_NAME(FontDescriptor))) return 1; - if (pdf_dict_get(ctx, obj, PDF_NAME_Length1) != NULL) + if (pdf_dict_get(ctx, obj, PDF_NAME(Length1)) != NULL) return 1; - if (pdf_dict_get(ctx, obj, PDF_NAME_Length2) != NULL) + if (pdf_dict_get(ctx, obj, PDF_NAME(Length2)) != NULL) return 1; - if (pdf_dict_get(ctx, obj, PDF_NAME_Length3) != NULL) + if (pdf_dict_get(ctx, obj, PDF_NAME(Length3)) != NULL) return 1; - if (o = pdf_dict_get(ctx, obj, PDF_NAME_Subtype), pdf_name_eq(ctx, o, PDF_NAME_Type1C)) + if (o = pdf_dict_get(ctx, obj, PDF_NAME(Subtype)), pdf_name_eq(ctx, o, PDF_NAME(Type1C))) return 1; - if (o = pdf_dict_get(ctx, obj, PDF_NAME_Subtype), pdf_name_eq(ctx, o, PDF_NAME_CIDFontType0C)) + if (o = pdf_dict_get(ctx, obj, PDF_NAME(Subtype)), pdf_name_eq(ctx, o, PDF_NAME(CIDFontType0C))) return 1; return 0; } static int is_xml_metadata(fz_context *ctx, pdf_obj *obj) { - if (pdf_name_eq(ctx, pdf_dict_get(ctx, obj, PDF_NAME_Type), PDF_NAME_Metadata)) - if (pdf_name_eq(ctx, pdf_dict_get(ctx, obj, PDF_NAME_Subtype), PDF_NAME_XML)) + if (pdf_name_eq(ctx, pdf_dict_get(ctx, obj, PDF_NAME(Type)), PDF_NAME(Metadata))) + if (pdf_name_eq(ctx, pdf_dict_get(ctx, obj, PDF_NAME(Subtype)), PDF_NAME(XML))) return 1; return 0; } @@ -1879,14 +1879,14 @@ static void writeobject(fz_context *ctx, pdf_document *doc, pdf_write_state *opt /* skip ObjStm and XRef objects */ if (pdf_is_dict(ctx, obj)) { - type = pdf_dict_get(ctx, obj, PDF_NAME_Type); - if (pdf_name_eq(ctx, type, PDF_NAME_ObjStm)) + type = pdf_dict_get(ctx, obj, PDF_NAME(Type)); + if (pdf_name_eq(ctx, type, PDF_NAME(ObjStm))) { opts->use_list[num] = 0; pdf_drop_obj(ctx, obj); return; } - if (skip_xrefs && pdf_name_eq(ctx, type, PDF_NAME_XRef)) + if (skip_xrefs && pdf_name_eq(ctx, type, PDF_NAME(XRef))) { opts->use_list[num] = 0; pdf_drop_obj(ctx, obj); @@ -2000,8 +2000,8 @@ static void writexref(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, if (opts->do_incremental) { trailer = pdf_keep_obj(ctx, pdf_trailer(ctx, doc)); - pdf_dict_put_int(ctx, trailer, PDF_NAME_Size, pdf_xref_len(ctx, doc)); - pdf_dict_put_int(ctx, trailer, PDF_NAME_Prev, doc->startxref); + pdf_dict_put_int(ctx, trailer, PDF_NAME(Size), pdf_xref_len(ctx, doc)); + pdf_dict_put_int(ctx, trailer, PDF_NAME(Prev), doc->startxref); doc->startxref = startxref; } else @@ -2009,30 +2009,30 @@ static void writexref(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, trailer = pdf_new_dict(ctx, doc, 5); nobj = pdf_new_int(ctx, doc, to); - pdf_dict_put_drop(ctx, trailer, PDF_NAME_Size, nobj); + pdf_dict_put_drop(ctx, trailer, PDF_NAME(Size), nobj); if (first) { - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Info); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Info)); if (obj) - pdf_dict_put(ctx, trailer, PDF_NAME_Info, obj); + pdf_dict_put(ctx, trailer, PDF_NAME(Info), obj); - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Root); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Root)); if (obj) - pdf_dict_put(ctx, trailer, PDF_NAME_Root, obj); + pdf_dict_put(ctx, trailer, PDF_NAME(Root), obj); - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_ID); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(ID)); if (obj) - pdf_dict_put(ctx, trailer, PDF_NAME_ID, obj); + pdf_dict_put(ctx, trailer, PDF_NAME(ID), obj); - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Encrypt); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Encrypt)); if (obj) - pdf_dict_put(ctx, trailer, PDF_NAME_Encrypt, obj); + pdf_dict_put(ctx, trailer, PDF_NAME(Encrypt), obj); } if (main_xref_offset != 0) { nobj = pdf_new_int(ctx, doc, main_xref_offset); - pdf_dict_put_drop(ctx, trailer, PDF_NAME_Prev, nobj); + pdf_dict_put_drop(ctx, trailer, PDF_NAME(Prev), nobj); } } @@ -2089,49 +2089,49 @@ static void writexrefstream(fz_context *ctx, pdf_document *doc, pdf_write_state if (first) { - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Info); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Info)); if (obj) - pdf_dict_put(ctx, dict, PDF_NAME_Info, obj); + pdf_dict_put(ctx, dict, PDF_NAME(Info), obj); - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Root); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Root)); if (obj) - pdf_dict_put(ctx, dict, PDF_NAME_Root, obj); + pdf_dict_put(ctx, dict, PDF_NAME(Root), obj); - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_ID); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(ID)); if (obj) - pdf_dict_put(ctx, dict, PDF_NAME_ID, obj); + pdf_dict_put(ctx, dict, PDF_NAME(ID), obj); if (opts->do_incremental) { - obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Encrypt); + obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Encrypt)); if (obj) - pdf_dict_put(ctx, dict, PDF_NAME_Encrypt, obj); + pdf_dict_put(ctx, dict, PDF_NAME(Encrypt), obj); } } - pdf_dict_put_int(ctx, dict, PDF_NAME_Size, to); + pdf_dict_put_int(ctx, dict, PDF_NAME(Size), to); if (opts->do_incremental) { - pdf_dict_put_int(ctx, dict, PDF_NAME_Prev, doc->startxref); + pdf_dict_put_int(ctx, dict, PDF_NAME(Prev), doc->startxref); doc->startxref = startxref; } else { if (main_xref_offset != 0) - pdf_dict_put_int(ctx, dict, PDF_NAME_Prev, main_xref_offset); + pdf_dict_put_int(ctx, dict, PDF_NAME(Prev), main_xref_offset); } - pdf_dict_put(ctx, dict, PDF_NAME_Type, PDF_NAME_XRef); + pdf_dict_put(ctx, dict, PDF_NAME(Type), PDF_NAME(XRef)); w = pdf_new_array(ctx, doc, 3); - pdf_dict_put(ctx, dict, PDF_NAME_W, w); + pdf_dict_put(ctx, dict, PDF_NAME(W), w); pdf_array_push_int(ctx, w, 1); pdf_array_push_int(ctx, w, 4); pdf_array_push_int(ctx, w, 1); index = pdf_new_array(ctx, doc, 2); - pdf_dict_put_drop(ctx, dict, PDF_NAME_Index, index); + pdf_dict_put_drop(ctx, dict, PDF_NAME(Index), index); /* opts->gen_list[num] is already initialized by fz_calloc. */ opts->use_list[num] = 1; @@ -2612,7 +2612,7 @@ static void presize_unsaved_signature_byteranges(fz_context *ctx, pdf_document * * the end and between each consecutive pair of signatures, * hence n + 1 */ int i; - pdf_obj *byte_range = pdf_dict_getl(ctx, usig->field, PDF_NAME_V, PDF_NAME_ByteRange, NULL); + pdf_obj *byte_range = pdf_dict_getl(ctx, usig->field, PDF_NAME(V), PDF_NAME(ByteRange), NULL); for (i = 0; i < n+1; i++) { @@ -2649,7 +2649,7 @@ static void complete_signatures(fz_context *ctx, pdf_document *doc, pdf_write_st for (usig = xref->unsaved_sigs; usig; usig = usig->next) { char *bstr, *cstr, *fstr; - int pnum = pdf_obj_parent_num(ctx, pdf_dict_getl(ctx, usig->field, PDF_NAME_V, PDF_NAME_ByteRange, NULL)); + int pnum = pdf_obj_parent_num(ctx, pdf_dict_getl(ctx, usig->field, PDF_NAME(V), PDF_NAME(ByteRange), NULL)); fz_seek(ctx, stm, opts->ofs_list[pnum], SEEK_SET); (void)fz_read(ctx, stm, (unsigned char *)buf, sizeof(buf)); buf[sizeof(buf)-1] = 0; @@ -2673,7 +2673,7 @@ static void complete_signatures(fz_context *ctx, pdf_document *doc, pdf_write_st /* Recreate ByteRange with correct values. Initially store the * recreated object in the first of the unsaved signatures */ byte_range = pdf_new_array(ctx, doc, 4); - pdf_dict_putl_drop(ctx, xref->unsaved_sigs->field, byte_range, PDF_NAME_V, PDF_NAME_ByteRange, NULL); + pdf_dict_putl_drop(ctx, xref->unsaved_sigs->field, byte_range, PDF_NAME(V), PDF_NAME(ByteRange), NULL); last_end = 0; for (usig = xref->unsaved_sigs; usig; usig = usig->next) @@ -2687,7 +2687,7 @@ static void complete_signatures(fz_context *ctx, pdf_document *doc, pdf_write_st /* Copy the new ByteRange to the other unsaved signatures */ for (usig = xref->unsaved_sigs->next; usig; usig = usig->next) - pdf_dict_putl_drop(ctx, usig->field, pdf_copy_array(ctx, byte_range), PDF_NAME_V, PDF_NAME_ByteRange, NULL); + pdf_dict_putl_drop(ctx, usig->field, pdf_copy_array(ctx, byte_range), PDF_NAME(V), PDF_NAME(ByteRange), NULL); /* Write the byte range into buf, padding with spaces*/ i = pdf_sprint_obj(ctx, buf, sizeof(buf), byte_range, 1); @@ -2884,7 +2884,7 @@ prepare_for_save(fz_context *ctx, pdf_document *doc, pdf_write_options *in_opts) static void change_identity(fz_context *ctx, pdf_document *doc) { - pdf_obj *identity = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_ID); + pdf_obj *identity = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(ID)); pdf_obj *str; unsigned char rnd[16]; @@ -2955,7 +2955,7 @@ do_pdf_save_document(fz_context *ctx, pdf_document *doc, pdf_write_state *opts, opts->crypt_object_number = 0; if (doc->crypt) { - pdf_obj *crypt = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Encrypt); + pdf_obj *crypt = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Encrypt)); int crypt_num = pdf_to_num(ctx, crypt); opts->crypt_object_number = opts->renumber_map[crypt_num]; } @@ -3200,10 +3200,10 @@ make_page_tree_node(fz_context *ctx, pdf_document *doc, int l, int r, pdf_obj *p fz_try(ctx) { me = pdf_new_dict(ctx, doc, 2); - pdf_dict_put(ctx, me, PDF_NAME_Type, PDF_NAME_Pages); - pdf_dict_put_int(ctx, me, PDF_NAME_Count, r-l); + pdf_dict_put(ctx, me, PDF_NAME(Type), PDF_NAME(Pages)); + pdf_dict_put_int(ctx, me, PDF_NAME(Count), r-l); if (!root) - pdf_dict_put(ctx, me, PDF_NAME_Parent, parent_ref); + pdf_dict_put(ctx, me, PDF_NAME(Parent), parent_ref); a = pdf_new_array(ctx, doc, KIDS_PER_LEVEL); me_ref = pdf_add_object(ctx, doc, me); @@ -3212,7 +3212,7 @@ make_page_tree_node(fz_context *ctx, pdf_document *doc, int l, int r, pdf_obj *p if (spaces >= r-l) { o = pdf_keep_obj(ctx, doc->page_refs[l++]); - pdf_dict_put(ctx, o, PDF_NAME_Parent, me_ref); + pdf_dict_put(ctx, o, PDF_NAME(Parent), me_ref); } else { @@ -3226,7 +3226,7 @@ make_page_tree_node(fz_context *ctx, pdf_document *doc, int l, int r, pdf_obj *p pdf_drop_obj(ctx, o); o = NULL; } - pdf_dict_put_drop(ctx, me, PDF_NAME_Kids, a); + pdf_dict_put_drop(ctx, me, PDF_NAME(Kids), a); a = NULL; } fz_always(ctx) @@ -3252,9 +3252,9 @@ pdf_rebalance_page_tree(fz_context *ctx, pdf_document *doc) if (!doc || !doc->needs_page_tree_rebuild) return; - catalog = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Root); + catalog = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME(Root)); pages = make_page_tree_node(ctx, doc, 0, doc->page_len, catalog, 1); - pdf_dict_put_drop(ctx, catalog, PDF_NAME_Pages, pages); + pdf_dict_put_drop(ctx, catalog, PDF_NAME(Pages), pages); doc->needs_page_tree_rebuild = 0; } |