From d065aca45bce7ee3668f59ca13cda46b52bc9bd6 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 29 Feb 2016 14:38:55 +0100 Subject: jni: Use boolean wmode in text and font classes. --- platform/java/TraceDevice.java | 2 +- platform/java/com/artifex/mupdf/fitz/Font.java | 4 ++-- platform/java/com/artifex/mupdf/fitz/Text.java | 8 ++++---- platform/java/com/artifex/mupdf/fitz/TextWalker.java | 2 +- platform/java/mupdf_native.c | 6 +++--- platform/java/mupdf_native.h | 12 ++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) (limited to 'platform/java') diff --git a/platform/java/TraceDevice.java b/platform/java/TraceDevice.java index ef006d8d..6eb28cbf 100644 --- a/platform/java/TraceDevice.java +++ b/platform/java/TraceDevice.java @@ -31,7 +31,7 @@ public class TraceDevice extends Device implements PathWalker, TextWalker System.out.println("closepath"); } - public void showGlyph(Font font, Matrix trm, int glyph, int unicode, int wmode) { + public void showGlyph(Font font, Matrix trm, int glyph, int unicode, boolean wmode) { System.out.println("glyph '" + (char)unicode + "' " + glyph + "\t" + font + " " + trm); } diff --git a/platform/java/com/artifex/mupdf/fitz/Font.java b/platform/java/com/artifex/mupdf/fitz/Font.java index 2f17ba0f..5101a6ac 100644 --- a/platform/java/com/artifex/mupdf/fitz/Font.java +++ b/platform/java/com/artifex/mupdf/fitz/Font.java @@ -28,10 +28,10 @@ public class Font public native String getName(); public native int encodeCharacter(int unicode); - public native float advanceGlyph(int glyph, int wmode); + public native float advanceGlyph(int glyph, boolean wmode); public float advanceGlyph(int glyph) { - return advanceGlyph(glyph, 0); + return advanceGlyph(glyph, false); } public String toString() { diff --git a/platform/java/com/artifex/mupdf/fitz/Text.java b/platform/java/com/artifex/mupdf/fitz/Text.java index 4f67266e..9a79bda2 100644 --- a/platform/java/com/artifex/mupdf/fitz/Text.java +++ b/platform/java/com/artifex/mupdf/fitz/Text.java @@ -26,17 +26,17 @@ public class Text implements TextWalker pointer = newNative(); } - public native void showGlyph(Font font, Matrix trm, int glyph, int unicode, int wmode); - public native void showString(Font font, Matrix trm, String string, int wmode); + public native void showGlyph(Font font, Matrix trm, int glyph, int unicode, boolean wmode); + public native void showString(Font font, Matrix trm, String string, boolean wmode); public native Rect getBounds(StrokeState stroke, Matrix ctm); public void showGlyph(Font font, Matrix trm, int glyph, int unicode) { - showGlyph(font, trm, glyph, unicode, 0); + showGlyph(font, trm, glyph, unicode, false); } public void showString(Font font, Matrix trm, String string) { - showString(font, trm, string, 0); + showString(font, trm, string, false); } public native void walk(TextWalker walker); diff --git a/platform/java/com/artifex/mupdf/fitz/TextWalker.java b/platform/java/com/artifex/mupdf/fitz/TextWalker.java index 89fe7c86..911c19bc 100644 --- a/platform/java/com/artifex/mupdf/fitz/TextWalker.java +++ b/platform/java/com/artifex/mupdf/fitz/TextWalker.java @@ -2,5 +2,5 @@ package com.artifex.mupdf.fitz; public interface TextWalker { - public void showGlyph(Font font, Matrix trm, int glyph, int unicode, int wmode); + public void showGlyph(Font font, Matrix trm, int glyph, int unicode, boolean wmode); } diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 064390e4..f47d9bf6 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -2309,7 +2309,7 @@ FUN(Font_encodeCharacter)(JNIEnv *env, jobject self, jint unicode) } JNIEXPORT jfloat JNICALL -FUN(Font_advanceGlyph)(JNIEnv *env, jobject self, jint glyph, jint wmode) +FUN(Font_advanceGlyph)(JNIEnv *env, jobject self, jint glyph, jboolean wmode) { fz_context *ctx = get_context(env); fz_font *font = from_Font(env, self); @@ -3027,7 +3027,7 @@ FUN(Text_getBounds)(JNIEnv *env, jobject self, jobject jstroke, jobject jctm) } JNIEXPORT void JNICALL -FUN(Text_showGlyph)(JNIEnv *env, jobject self, jobject font_, jobject matrix_, jint glyph, jint unicode, jint wmode) +FUN(Text_showGlyph)(JNIEnv *env, jobject self, jobject font_, jobject matrix_, jint glyph, jint unicode, jboolean wmode) { fz_context *ctx = get_context(env); fz_text *text = from_Text(env, self); @@ -3044,7 +3044,7 @@ FUN(Text_showGlyph)(JNIEnv *env, jobject self, jobject font_, jobject matrix_, j } JNIEXPORT void JNICALL -FUN(Text_showString)(JNIEnv *env, jobject self, jobject font_, jobject matrix_, jstring string_, jint wmode) +FUN(Text_showString)(JNIEnv *env, jobject self, jobject font_, jobject matrix_, jstring string_, jboolean wmode) { fz_context *ctx = get_context(env); fz_text *text = from_Text(env, self); diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h index 771412d6..6a9c3a0c 100644 --- a/platform/java/mupdf_native.h +++ b/platform/java/mupdf_native.h @@ -597,10 +597,10 @@ JNIEXPORT jint JNICALL Java_com_artifex_mupdf_fitz_Font_encodeCharacter /* * Class: com_artifex_mupdf_fitz_Font * Method: advanceGlyph - * Signature: (II)F + * Signature: (IZ)F */ JNIEXPORT jfloat JNICALL Java_com_artifex_mupdf_fitz_Font_advanceGlyph - (JNIEnv *, jobject, jint, jint); + (JNIEnv *, jobject, jint, jboolean); #ifdef __cplusplus } @@ -1554,18 +1554,18 @@ JNIEXPORT jlong JNICALL Java_com_artifex_mupdf_fitz_Text_cloneNative /* * Class: com_artifex_mupdf_fitz_Text * Method: showGlyph - * Signature: (Lcom/artifex/mupdf/fitz/Font;Lcom/artifex/mupdf/fitz/Matrix;III)V + * Signature: (Lcom/artifex/mupdf/fitz/Font;Lcom/artifex/mupdf/fitz/Matrix;IIZ)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Text_showGlyph - (JNIEnv *, jobject, jobject, jobject, jint, jint, jint); + (JNIEnv *, jobject, jobject, jobject, jint, jint, jboolean); /* * Class: com_artifex_mupdf_fitz_Text * Method: showString - * Signature: (Lcom/artifex/mupdf/fitz/Font;Lcom/artifex/mupdf/fitz/Matrix;Ljava/lang/String;I)V + * Signature: (Lcom/artifex/mupdf/fitz/Font;Lcom/artifex/mupdf/fitz/Matrix;Ljava/lang/String;Z)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Text_showString - (JNIEnv *, jobject, jobject, jobject, jstring, jint); + (JNIEnv *, jobject, jobject, jobject, jstring, jboolean); /* * Class: com_artifex_mupdf_fitz_Text -- cgit v1.2.3