Rename pdf_add_simple_font_res and friends.

6 files changed, 14 insertions, 14 deletions

diff --git a/include/mupdf/pdf/font.h b/include/mupdf/pdf/font.h
index 94db1727..343d6237 100644
--- a/include/mupdf/pdf/font.h
+++ b/include/mupdf/pdf/font.h
@@ -121,8 +121,8 @@ float pdf_text_stride(fz_context *ctx, pdf_font_desc *fontdesc, float fontsize,
 
 void pdf_run_glyph(fz_context *ctx, pdf_document *doc, pdf_obj *resources, fz_buffer *contents, fz_device *dev, const fz_matrix *ctm, void *gstate, int nestedDepth);
 
-pdf_obj *pdf_add_simple_font_res(fz_context *ctx, pdf_document *doc, fz_font *font);
-pdf_obj *pdf_add_cid_font_res(fz_context *ctx, pdf_document *doc, fz_font *font);
+pdf_obj *pdf_add_simple_font(fz_context *ctx, pdf_document *doc, fz_font *font);
+pdf_obj *pdf_add_cid_font(fz_context *ctx, pdf_document *doc, fz_font *font);
 
 int pdf_font_writing_supported(fz_font *font);
 
diff --git a/include/mupdf/pdf/resource.h b/include/mupdf/pdf/resource.h
index 41a8c27a..f8d6a2fa 100644
--- a/include/mupdf/pdf/resource.h
+++ b/include/mupdf/pdf/resource.h
@@ -56,7 +56,7 @@ int pdf_is_jpx_image(fz_context *ctx, pdf_obj *dict);
 
 fz_image *pdf_load_image(fz_context *ctx, pdf_document *doc, pdf_obj *obj);
 
-pdf_obj* pdf_add_image_res(fz_context *ctx, pdf_document *doc, fz_image *image, int mask);
+pdf_obj* pdf_add_image(fz_context *ctx, pdf_document *doc, fz_image *image, int mask);
 
 /*
  * Pattern
diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c
index e7215eaa..c7c5debf 100644
--- a/source/pdf/pdf-device.c
+++ b/source/pdf/pdf-device.c
@@ -406,7 +406,7 @@ pdf_dev_font(fz_context *ctx, pdf_device *pdev, fz_font *font, float size)
 	if (font->buffer != NULL)
 	{
 		/* This will add it to the xref if needed */
-		fres = pdf_add_cid_font_res(ctx, doc, font);
+		fres = pdf_add_cid_font(ctx, doc, font);
 		fz_buffer_printf(ctx, gs->buf, "/F%d %f Tf\n", pdf_to_num(ctx, fres), size);
 
 		/* Possibly add to page resources */
@@ -944,10 +944,10 @@ pdf_dev_fill_image(fz_context *ctx, fz_device *dev, fz_image *image, const fz_ma
 	fz_matrix local_ctm = *ctm;
 
 	pdf_dev_end_text(ctx, pdev);
-	im_res = pdf_add_image_res(ctx, pdev->doc, image, 0);
+	im_res = pdf_add_image(ctx, pdev->doc, image, 0);
 	if (im_res == NULL)
 	{
-		fz_warn(ctx, "pdf_add_image_res: problem adding image resource");
+		fz_warn(ctx, "pdf_add_image: problem adding image resource");
 		return;
 	}
 	pdf_dev_alpha(ctx, pdev, alpha, 0);
@@ -982,10 +982,10 @@ pdf_dev_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *image, const
 	fz_matrix local_ctm = *ctm;
 
 	pdf_dev_end_text(ctx, pdev);
-	im_res = pdf_add_image_res(ctx, pdev->doc, image, 1);
+	im_res = pdf_add_image(ctx, pdev->doc, image, 1);
 	if (im_res == NULL)
 	{
-		fz_warn(ctx, "pdf_add_image_res: problem adding image resource");
+		fz_warn(ctx, "pdf_add_image: problem adding image resource");
 		return;
 	}
 	fz_buffer_printf(ctx, gs->buf, "q\n");
diff --git a/source/pdf/pdf-font.c b/source/pdf/pdf-font.c
index 8240daa8..36d36f87 100644
--- a/source/pdf/pdf-font.c
+++ b/source/pdf/pdf-font.c
@@ -2036,7 +2036,7 @@ pdf_add_cid_to_unicode(fz_context *ctx, pdf_document *doc, pdf_font_desc *fontde
  * We can possibly get width information that may have been embedded in
  * the PDF /W array (or W2 if vertical text) */
 pdf_obj *
-pdf_add_cid_font_res(fz_context *ctx, pdf_document *doc, fz_font *font)
+pdf_add_cid_font(fz_context *ctx, pdf_document *doc, fz_font *font)
 {
 	pdf_obj *fobj = NULL;
 	pdf_obj *fref = NULL;
@@ -2116,7 +2116,7 @@ pdf_add_cid_font_res(fz_context *ctx, pdf_document *doc, fz_font *font)
 
 /* Creates simple font */
 pdf_obj *
-pdf_add_simple_font_res(fz_context *ctx, pdf_document *doc, fz_font *font)
+pdf_add_simple_font(fz_context *ctx, pdf_document *doc, fz_font *font)
 {
 	pdf_obj *fobj = NULL;
 	pdf_obj *fref = NULL;
diff --git a/source/pdf/pdf-image.c b/source/pdf/pdf-image.c
index ef26a9b1..df745616 100644
--- a/source/pdf/pdf-image.c
+++ b/source/pdf/pdf-image.c
@@ -291,7 +291,7 @@ pdf_load_image(fz_context *ctx, pdf_document *doc, pdf_obj *dict)
 }
 
 pdf_obj *
-pdf_add_image_res(fz_context *ctx, pdf_document *doc, fz_image *image, int mask)
+pdf_add_image(fz_context *ctx, pdf_document *doc, fz_image *image, int mask)
 {
 	fz_pixmap *pixmap = NULL;
 	pdf_obj *imobj = NULL;
@@ -440,7 +440,7 @@ pdf_add_image_res(fz_context *ctx, pdf_document *doc, fz_image *image, int mask)
 				pdf_dict_put_drop(ctx, imobj, PDF_NAME_ImageMask, pdf_new_bool(ctx, doc, 1));
 			}
 			if (image->mask)
-				pdf_add_image_res(ctx, doc, image->mask, 0);
+				pdf_add_image(ctx, doc, image->mask, 0);
 			imref = pdf_new_ref(ctx, doc, imobj);
 			pdf_update_stream(ctx, doc, imref, buffer, 1);
 
diff --git a/source/tools/pdfcreate.c b/source/tools/pdfcreate.c
index bb9e9108..3f9e880c 100644
--- a/source/tools/pdfcreate.c
+++ b/source/tools/pdfcreate.c
@@ -38,7 +38,7 @@ static void add_font_res(pdf_obj *fonts, char *name, char *path)
 	else
 		font = fz_new_font_from_file(ctx, NULL, path, 0, 0);
 
-	res = pdf_add_simple_font_res(ctx, doc, font);
+	res = pdf_add_simple_font(ctx, doc, font);
 	pdf_dict_puts(ctx, fonts, name, res);
 	pdf_drop_obj(ctx, res);
 
@@ -52,7 +52,7 @@ static void add_image_res(pdf_obj *images, char *name, char *path)
 
 	image = fz_new_image_from_file(ctx, path);
 
-	res = pdf_add_image_res(ctx, doc, image, 0);
+	res = pdf_add_image(ctx, doc, image, 0);
 	pdf_dict_puts(ctx, images, name, res);
 	pdf_drop_obj(ctx, res);