diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2018-05-07 16:31:31 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2018-05-09 15:32:55 +0200 |
| commit | 241ead28d9709ca6c442c9bd1ed02c029dee4b12 (patch) | |
| tree | f9cb8a3dfa557d550efedb33a684bbdd543f5e2e /platform/java | |
| parent | 934c511da4d3585631b4a32a81a16228202f9ec7 (diff) | |
| download | mupdf-241ead28d9709ca6c442c9bd1ed02c029dee4b12.tar.xz | |
Fix java build.
Diffstat (limited to 'platform/java')
| -rw-r--r-- | platform/java/Makefile | 2 | ||||
| -rw-r--r-- | platform/java/mupdf_native.c | 4 | ||||
| -rw-r--r-- | platform/java/mupdf_native.h | 4 | ||||
| -rw-r--r-- | platform/java/src/com/artifex/mupdf/fitz/PDFDocument.java | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/platform/java/Makefile b/platform/java/Makefile index 9863ab6e..94ed493a 100644 --- a/platform/java/Makefile +++ b/platform/java/Makefile @@ -25,7 +25,7 @@ endif default: $(MUPDF_JAVA) libmupdf.jar -MUPDF_CORE := ../../build/java/libmupdf.a ../../build/java/libmupdfthird.a +MUPDF_CORE := ../../build/java/libmupdf.a ../../build/java/libmupdf-third.a ifeq "$(OS)" "Linux" $(MUPDF_CORE) : .FORCE $(MAKE) -C ../.. OUT=build/java XCFLAGS=-fPIC FREETYPE_DIR=/foo ZLIB_DIR=/foo libs diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index b47192bc..592c6c7d 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -7266,7 +7266,7 @@ FUN(PDFDocument_addFont)(JNIEnv *env, jobject self, jobject jfont) } JNIEXPORT jobject JNICALL -FUN(PDFDocument_addCJKFont)(JNIEnv *env, jobject self, jobject jfont, jint ordering) +FUN(PDFDocument_addCJKFont)(JNIEnv *env, jobject self, jobject jfont, jint ordering, jint wmode, jboolean serif) { fz_context *ctx = get_context(env); pdf_document *pdf = from_PDFDocument(env, self); @@ -7277,7 +7277,7 @@ FUN(PDFDocument_addCJKFont)(JNIEnv *env, jobject self, jobject jfont, jint order if (!font) { jni_throw_arg(env, "font must not be null"); return NULL; } fz_try(ctx) - ind = pdf_add_cjk_font(ctx, pdf, font, ordering); + ind = pdf_add_cjk_font(ctx, pdf, font, ordering, wmode, serif); fz_catch(ctx) { jni_rethrow(env, ctx); diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h index 22fdc04a..85e68b8f 100644 --- a/platform/java/mupdf_native.h +++ b/platform/java/mupdf_native.h @@ -1919,10 +1919,10 @@ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_PDFDocument_addSimpleFont /* * Class: com_artifex_mupdf_fitz_PDFDocument * Method: addCJKFont - * Signature: (Lcom/artifex/mupdf/fitz/Font;I)Lcom/artifex/mupdf/fitz/PDFObject; + * Signature: (Lcom/artifex/mupdf/fitz/Font;IIZ)Lcom/artifex/mupdf/fitz/PDFObject; */ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_PDFDocument_addCJKFont - (JNIEnv *, jobject, jobject, jint); + (JNIEnv *, jobject, jobject, jint, jint, jboolean); /* * Class: com_artifex_mupdf_fitz_PDFDocument diff --git a/platform/java/src/com/artifex/mupdf/fitz/PDFDocument.java b/platform/java/src/com/artifex/mupdf/fitz/PDFDocument.java index 211b6ab1..80e45850 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/PDFDocument.java +++ b/platform/java/src/com/artifex/mupdf/fitz/PDFDocument.java @@ -97,7 +97,7 @@ public class PDFDocument extends Document public native void deletePage(int at); public native PDFObject addImage(Image image); public native PDFObject addSimpleFont(Font font, int encoding); - public native PDFObject addCJKFont(Font font, int ordering); + public native PDFObject addCJKFont(Font font, int ordering, int wmode, boolean serif); public native PDFObject addFont(Font font); public native boolean hasUnsavedChanges(); public native boolean canBeSavedIncrementally(); |