summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2016-09-22 14:01:31 +0200
committerTor Andersson <tor.andersson@artifex.com>2016-09-23 12:40:33 +0200
commitca8f110730ad5aadbc80a450a46de62c4004cbd1 (patch)
treee2b3dbe2bef2ae4adf78643150575d9722b573a2 /platform/android
parent3a29d83d78af4c580d02bae6ae7a81127005a8b6 (diff)
downloadmupdf-ca8f110730ad5aadbc80a450a46de62c4004cbd1.tar.xz
Clean up annotation enum names.
Put them in the PDF name space and separate words with underscores. Remove redundant namespace prefixes in java constants. Device.FLAG_MASK rather than Device.FZ_DEVFLAG_MASK. Use namespace for PDF annotation flag enum.
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/viewer/jni/mupdf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/platform/android/viewer/jni/mupdf.c b/platform/android/viewer/jni/mupdf.c
index 4f3b31f7..b682296c 100644
--- a/platform/android/viewer/jni/mupdf.c
+++ b/platform/android/viewer/jni/mupdf.c
@@ -1546,7 +1546,7 @@ JNI_FN(MuPDFCore_addMarkupAnnotationInternal)(JNIEnv * env, jobject thiz, jobjec
switch (type)
{
- case FZ_ANNOT_HIGHLIGHT:
+ case PDF_ANNOT_HIGHLIGHT:
color[0] = 1.0;
color[1] = 1.0;
color[2] = 0.0;
@@ -1554,7 +1554,7 @@ JNI_FN(MuPDFCore_addMarkupAnnotationInternal)(JNIEnv * env, jobject thiz, jobjec
line_thickness = 1.0;
line_height = 0.5;
break;
- case FZ_ANNOT_UNDERLINE:
+ case PDF_ANNOT_UNDERLINE:
color[0] = 0.0;
color[1] = 0.0;
color[2] = 1.0;
@@ -1562,7 +1562,7 @@ JNI_FN(MuPDFCore_addMarkupAnnotationInternal)(JNIEnv * env, jobject thiz, jobjec
line_thickness = LINE_THICKNESS;
line_height = UNDERLINE_HEIGHT;
break;
- case FZ_ANNOT_STRIKEOUT:
+ case PDF_ANNOT_STRIKE_OUT:
color[0] = 1.0;
color[1] = 0.0;
color[2] = 0.0;
@@ -1697,7 +1697,7 @@ JNI_FN(MuPDFCore_addInkAnnotationInternal)(JNIEnv * env, jobject thiz, jobjectAr
(*env)->DeleteLocalRef(env, arc);
}
- annot = (fz_annot *)pdf_create_annot(ctx, idoc, (pdf_page *)pc->page, FZ_ANNOT_INK);
+ annot = (fz_annot *)pdf_create_annot(ctx, idoc, (pdf_page *)pc->page, PDF_ANNOT_INK);
pdf_set_ink_annot_list(ctx, idoc, (pdf_annot *)annot, pts, counts, n, color, INK_THICKNESS);