From 47f4a39fa39e5f4c8b7ef8fc91d90728c9880220 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 26 Jun 2018 11:18:39 +0200 Subject: Rename pdf_get_annot_contents to pdf_annot_contents. Since the function no longer returns ownership of the string, use the common naming convention. --- include/mupdf/pdf/annot.h | 8 ++++---- platform/gl/gl-annotate.c | 4 ++-- platform/java/mupdf_native.c | 4 ++-- source/pdf/pdf-annot.c | 4 ++-- source/pdf/pdf-appearance.c | 2 +- source/tools/murun.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/mupdf/pdf/annot.h b/include/mupdf/pdf/annot.h index 869678c0..9ba30d1b 100644 --- a/include/mupdf/pdf/annot.h +++ b/include/mupdf/pdf/annot.h @@ -220,9 +220,9 @@ void pdf_set_annot_vertex(fz_context *ctx, pdf_annot *annot, int i, fz_point p); void pdf_set_text_annot_position(fz_context *ctx, pdf_annot *annot, fz_point pt); /* - pdf_get_annot_contents: return the contents of an annotation. + pdf_annot_contents: return the contents of an annotation. */ -const char *pdf_get_annot_contents(fz_context *ctx, pdf_annot *annot); +const char *pdf_annot_contents(fz_context *ctx, pdf_annot *annot); /* pdf_set_annot_contents: set the contents of an annotation. @@ -230,9 +230,9 @@ const char *pdf_get_annot_contents(fz_context *ctx, pdf_annot *annot); void pdf_set_annot_contents(fz_context *ctx, pdf_annot *annot, const char *text); /* - pdf_get_annot_author: return the author of an annotation. + pdf_annot_author: return the author of an annotation. */ -const char *pdf_get_annot_author(fz_context *ctx, pdf_annot *annot); +const char *pdf_annot_author(fz_context *ctx, pdf_annot *annot); /* pdf_set_annot_author: set the author of an annotation. diff --git a/platform/gl/gl-annotate.c b/platform/gl/gl-annotate.c index 873612c7..9acf7746 100644 --- a/platform/gl/gl-annotate.c +++ b/platform/gl/gl-annotate.c @@ -314,7 +314,7 @@ static void do_annotate_author(void) { if (pdf_annot_has_author(ctx, selected_annot)) { - const char *author = pdf_get_annot_author(ctx, selected_annot); + const char *author = pdf_annot_author(ctx, selected_annot); if (strlen(author) > 0) ui_label("Author: %s", author); } @@ -348,7 +348,7 @@ static void do_annotate_contents(void) if (selected_annot != last_annot) { last_annot = selected_annot; - contents = pdf_get_annot_contents(ctx, selected_annot); + contents = pdf_annot_contents(ctx, selected_annot); ui_input_init(&input, contents); } diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 9173278f..2a8e517a 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -8830,7 +8830,7 @@ FUN(PDFAnnotation_getContents)(JNIEnv *env, jobject self) if (!ctx || !annot) return NULL; fz_try(ctx) - contents = pdf_get_annot_contents(ctx, annot); + contents = pdf_annot_contents(ctx, annot); fz_catch(ctx) { jni_rethrow(env, ctx); @@ -8873,7 +8873,7 @@ FUN(PDFAnnotation_getAuthor)(JNIEnv *env, jobject self) if (!ctx || !annot) return NULL; fz_try(ctx) - author = pdf_get_annot_author(ctx, annot); + author = pdf_annot_author(ctx, annot); fz_catch(ctx) { jni_rethrow(env, ctx); diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c index b265d9d9..b53beeb2 100644 --- a/source/pdf/pdf-annot.c +++ b/source/pdf/pdf-annot.c @@ -393,7 +393,7 @@ pdf_set_annot_rect(fz_context *ctx, pdf_annot *annot, const fz_rect *rect) } const char * -pdf_get_annot_contents(fz_context *ctx, pdf_annot *annot) +pdf_annot_contents(fz_context *ctx, pdf_annot *annot) { return pdf_dict_get_text_string(ctx, annot->obj, PDF_NAME(Contents)); } @@ -1398,7 +1398,7 @@ pdf_annot_has_author(fz_context *ctx, pdf_annot *annot) } const char * -pdf_get_annot_author(fz_context *ctx, pdf_annot *annot) +pdf_annot_author(fz_context *ctx, pdf_annot *annot) { check_allowed_subtypes(ctx, annot, PDF_NAME(T), markup_subtypes); return pdf_dict_get_text_string(ctx, annot->obj, PDF_NAME(T)); diff --git a/source/pdf/pdf-appearance.c b/source/pdf/pdf-appearance.c index b80b2764..e936bbb0 100644 --- a/source/pdf/pdf-appearance.c +++ b/source/pdf/pdf-appearance.c @@ -955,7 +955,7 @@ pdf_write_free_text_appearance(fz_context *ctx, pdf_annot *annot, fz_buffer *buf int q, r; /* /Rotate is an undocumented annotation property supported by Adobe */ - text = pdf_get_annot_contents(ctx, annot); + text = pdf_annot_contents(ctx, annot); r = pdf_dict_get_int(ctx, annot->obj, PDF_NAME(Rotate)); q = pdf_annot_quadding(ctx, annot); pdf_annot_default_appearance(ctx, annot, &font, &size, color); diff --git a/source/tools/murun.c b/source/tools/murun.c index f7a890b2..10d76e8b 100644 --- a/source/tools/murun.c +++ b/source/tools/murun.c @@ -4086,7 +4086,7 @@ static void ffi_PDFAnnotation_getContents(js_State *J) const char *contents = NULL; fz_try(ctx) - contents = pdf_get_annot_contents(ctx, annot); + contents = pdf_annot_contents(ctx, annot); fz_catch(ctx) rethrow(J); @@ -4378,7 +4378,7 @@ static void ffi_PDFAnnotation_getAuthor(js_State *J) const char *author = NULL; fz_try(ctx) - author = pdf_get_annot_author(ctx, annot); + author = pdf_annot_author(ctx, annot); fz_catch(ctx) rethrow(J); -- cgit v1.2.3