diff options
Diffstat (limited to 'source/pdf/pdf-device.c')
| -rw-r--r-- | source/pdf/pdf-device.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c index db699dd0..9b33e5c9 100644 --- a/source/pdf/pdf-device.c +++ b/source/pdf/pdf-device.c @@ -313,7 +313,7 @@ pdf_dev_alpha(fz_context *ctx, pdf_device *pdev, float alpha, int stroke) fz_try(ctx) { char text[32]; - pdf_dict_put_real(ctx, o, (stroke ? PDF_NAME_CA : PDF_NAME_ca), alpha); + pdf_dict_put_real(ctx, o, (stroke ? PDF_NAME(CA) : PDF_NAME(ca)), alpha); fz_snprintf(text, sizeof(text), "ExtGState/Alp%d", i); ref = pdf_add_object(ctx, doc, o); pdf_dict_putp_drop(ctx, pdev->resources, text, ref); @@ -567,20 +567,20 @@ pdf_dev_new_form(fz_context *ctx, pdf_obj **form_ref, pdf_device *pdev, const fz group = pdf_new_dict(ctx, doc, 5); fz_try(ctx) { - pdf_dict_put(ctx, group, PDF_NAME_Type, PDF_NAME_Group); - pdf_dict_put(ctx, group, PDF_NAME_S, PDF_NAME_Transparency); - pdf_dict_put_bool(ctx, group, PDF_NAME_K, knockout); - pdf_dict_put_bool(ctx, group, PDF_NAME_I, isolated); + pdf_dict_put(ctx, group, PDF_NAME(Type), PDF_NAME(Group)); + pdf_dict_put(ctx, group, PDF_NAME(S), PDF_NAME(Transparency)); + pdf_dict_put_bool(ctx, group, PDF_NAME(K), knockout); + pdf_dict_put_bool(ctx, group, PDF_NAME(I), isolated); switch (fz_colorspace_type(ctx, colorspace)) { case FZ_COLORSPACE_GRAY: - pdf_dict_put(ctx, group, PDF_NAME_CS, PDF_NAME_DeviceGray); + pdf_dict_put(ctx, group, PDF_NAME(CS), PDF_NAME(DeviceGray)); break; case FZ_COLORSPACE_RGB: - pdf_dict_put(ctx, group, PDF_NAME_CS, PDF_NAME_DeviceRGB); + pdf_dict_put(ctx, group, PDF_NAME(CS), PDF_NAME(DeviceRGB)); break; case FZ_COLORSPACE_CMYK: - pdf_dict_put(ctx, group, PDF_NAME_CS, PDF_NAME_DeviceCMYK); + pdf_dict_put(ctx, group, PDF_NAME(CS), PDF_NAME(DeviceCMYK)); break; default: break; @@ -602,10 +602,10 @@ pdf_dev_new_form(fz_context *ctx, pdf_obj **form_ref, pdf_device *pdev, const fz form = pdf_new_dict(ctx, doc, 4); fz_try(ctx) { - pdf_dict_put(ctx, form, PDF_NAME_Subtype, PDF_NAME_Form); - pdf_dict_put(ctx, form, PDF_NAME_Group, group_ref); - pdf_dict_put_int(ctx, form, PDF_NAME_FormType, 1); - pdf_dict_put_rect(ctx, form, PDF_NAME_BBox, bbox); + pdf_dict_put(ctx, form, PDF_NAME(Subtype), PDF_NAME(Form)); + pdf_dict_put(ctx, form, PDF_NAME(Group), group_ref); + pdf_dict_put_int(ctx, form, PDF_NAME(FormType), 1); + pdf_dict_put_rect(ctx, form, PDF_NAME(BBox), bbox); *form_ref = pdf_add_object(ctx, doc, form); } fz_always(ctx) @@ -918,18 +918,18 @@ pdf_dev_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *bbox, int lum { int n = fz_colorspace_n(ctx, colorspace); smask = pdf_new_dict(ctx, doc, 4); - pdf_dict_put(ctx, smask, PDF_NAME_Type, PDF_NAME_Mask); - pdf_dict_put(ctx, smask, PDF_NAME_S, (luminosity ? PDF_NAME_Luminosity : PDF_NAME_Alpha)); - pdf_dict_put(ctx, smask, PDF_NAME_G, form_ref); + pdf_dict_put(ctx, smask, PDF_NAME(Type), PDF_NAME(Mask)); + pdf_dict_put(ctx, smask, PDF_NAME(S), (luminosity ? PDF_NAME(Luminosity) : PDF_NAME(Alpha))); + pdf_dict_put(ctx, smask, PDF_NAME(G), form_ref); color_obj = pdf_new_array(ctx, doc, n); for (i = 0; i < n; i++) pdf_array_push_real(ctx, color_obj, color[i]); - pdf_dict_put_drop(ctx, smask, PDF_NAME_BC, color_obj); + pdf_dict_put_drop(ctx, smask, PDF_NAME(BC), color_obj); color_obj = NULL; egs = pdf_new_dict(ctx, doc, 5); - pdf_dict_put(ctx, egs, PDF_NAME_Type, PDF_NAME_ExtGState); - pdf_dict_put_drop(ctx, egs, PDF_NAME_SMask, pdf_add_object(ctx, doc, smask)); + pdf_dict_put(ctx, egs, PDF_NAME(Type), PDF_NAME(ExtGState)); + pdf_dict_put_drop(ctx, egs, PDF_NAME(SMask), pdf_add_object(ctx, doc, smask)); { char text[32]; @@ -999,8 +999,8 @@ pdf_dev_begin_group(fz_context *ctx, fz_device *dev, const fz_rect *bbox, fz_col { /* No, better make one */ obj = pdf_new_dict(ctx, doc, 2); - pdf_dict_put(ctx, obj, PDF_NAME_Type, PDF_NAME_ExtGState); - pdf_dict_put_name(ctx, obj, PDF_NAME_BM, fz_blendmode_name(blendmode)); + pdf_dict_put(ctx, obj, PDF_NAME(Type), PDF_NAME(ExtGState)); + pdf_dict_put_name(ctx, obj, PDF_NAME(BM), fz_blendmode_name(blendmode)); pdf_dict_putp_drop(ctx, pdev->resources, text, obj); } } |