diff options
Diffstat (limited to 'platform/java')
| -rw-r--r-- | platform/java/mupdf_native.c | 96 | ||||
| -rw-r--r-- | platform/java/mupdf_native.h | 676 | ||||
| -rw-r--r-- | platform/java/src/com/artifex/mupdf/fitz/ColorParams.java | 51 | ||||
| -rw-r--r-- | platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java | 17 |
4 files changed, 477 insertions, 363 deletions
diff --git a/platform/java/mupdf_native.c b/platform/java/mupdf_native.c index 137a1c1a..7e88822c 100644 --- a/platform/java/mupdf_native.c +++ b/platform/java/mupdf_native.c @@ -1154,6 +1154,14 @@ static inline jobject to_Annotation_safe(fz_context *ctx, JNIEnv *env, fz_annot return jannot; } +static inline jint to_ColorParams_safe(fz_context *ctx, JNIEnv *env, const fz_color_params *cp) +{ + if (!ctx || !cp) + return 0; + + return (((!!cp->bp)<<5) | ((!!cp->op)<<6) || ((!!cp->opm)<<7) || (cp->ri & 31)); +} + static inline jobject to_ColorSpace_safe(fz_context *ctx, JNIEnv *env, fz_colorspace *cs) { jobject jcs; @@ -1700,6 +1708,18 @@ static inline fz_buffer *from_Buffer_safe(JNIEnv *env, jobject jobj) return CAST(fz_buffer *, (*env)->GetLongField(env, jobj, fid_Buffer_pointer)); } +static inline fz_color_params from_ColorParams_safe(JNIEnv *env, jint params) +{ + fz_color_params p; + + p.bp = (params>>5) & 1; + p.op = (params>>6) & 1; + p.opm = (params>>7) & 1; + p.ri = (params & 31); + + return p; +} + static inline fz_colorspace *from_ColorSpace_safe(JNIEnv *env, jobject jobj) { if (!jobj) return NULL; @@ -1837,7 +1857,7 @@ typedef struct fz_java_device; static void -fz_java_device_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha) +fz_java_device_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, int even_odd, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha, const fz_color_params *cs_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; @@ -1845,14 +1865,15 @@ fz_java_device_fill_path(fz_context *ctx, fz_device *dev, const fz_path *path, i jobject jcs = to_ColorSpace(ctx, env, cs); jobject jctm = to_Matrix(ctx, env, ctm); jfloatArray jcolor = to_jfloatArray(ctx, env, color, cs ? fz_colorspace_n(ctx, cs) : FZ_MAX_COLORS); + int jcp = to_ColorParams_safe(ctx, env, cs_params); - (*env)->CallVoidMethod(env, jdev->self, mid_Device_fillPath, jpath, (jboolean)even_odd, jctm, jcs, jcolor, alpha); + (*env)->CallVoidMethod(env, jdev->self, mid_Device_fillPath, jpath, (jboolean)even_odd, jctm, jcs, jcolor, alpha, jcp); if ((*env)->ExceptionCheck(env)) fz_throw_java(ctx, env); } static void -fz_java_device_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *state, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha) +fz_java_device_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, const fz_stroke_state *state, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha, const fz_color_params *cs_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; @@ -1861,8 +1882,9 @@ fz_java_device_stroke_path(fz_context *ctx, fz_device *dev, const fz_path *path, jobject jcs = to_ColorSpace(ctx, env, cs); jobject jctm = to_Matrix(ctx, env, ctm); jfloatArray jcolor = to_jfloatArray(ctx, env, color, cs ? fz_colorspace_n(ctx, cs) : FZ_MAX_COLORS); + int jcp = to_ColorParams_safe(ctx, env, cs_params); - (*env)->CallVoidMethod(env, jdev->self, mid_Device_strokePath, jpath, jstate, jctm, jcs, jcolor, alpha); + (*env)->CallVoidMethod(env, jdev->self, mid_Device_strokePath, jpath, jstate, jctm, jcs, jcolor, alpha, jcp); if ((*env)->ExceptionCheck(env)) fz_throw_java(ctx, env); } @@ -1895,7 +1917,7 @@ fz_java_device_clip_stroke_path(fz_context *ctx, fz_device *dev, const fz_path * } static void -fz_java_device_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha) +fz_java_device_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha, const fz_color_params *cs_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; @@ -1903,14 +1925,15 @@ fz_java_device_fill_text(fz_context *ctx, fz_device *dev, const fz_text *text, c jobject jctm = to_Matrix(ctx, env, ctm); jobject jcs = to_ColorSpace(ctx, env, cs); jfloatArray jcolor = to_jfloatArray(ctx, env, color, cs ? fz_colorspace_n(ctx, cs) : FZ_MAX_COLORS); + int jcp = to_ColorParams_safe(ctx, env, cs_params); - (*env)->CallVoidMethod(env, jdev->self, mid_Device_fillText, jtext, jctm, jcs, jcolor, alpha); + (*env)->CallVoidMethod(env, jdev->self, mid_Device_fillText, jtext, jctm, jcs, jcolor, alpha, jcp); if ((*env)->ExceptionCheck(env)) fz_throw_java(ctx, env); } static void -fz_java_device_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *state, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha) +fz_java_device_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, const fz_stroke_state *state, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha, const fz_color_params *cs_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; @@ -1919,8 +1942,9 @@ fz_java_device_stroke_text(fz_context *ctx, fz_device *dev, const fz_text *text, jobject jctm = to_Matrix(ctx, env, ctm); jobject jcs = to_ColorSpace(ctx, env, cs); jfloatArray jcolor = to_jfloatArray(ctx, env, color, cs ? fz_colorspace_n(ctx, cs) : FZ_MAX_COLORS); + int jcp = to_ColorParams_safe(ctx, env, cs_params); - (*env)->CallVoidMethod(env, jdev->self, mid_Device_strokeText, jtext, jstate, jctm, jcs, jcolor, alpha); + (*env)->CallVoidMethod(env, jdev->self, mid_Device_strokeText, jtext, jstate, jctm, jcs, jcolor, alpha, jcp); if ((*env)->ExceptionCheck(env)) fz_throw_java(ctx, env); } @@ -1966,7 +1990,7 @@ fz_java_device_ignore_text(fz_context *ctx, fz_device *dev, const fz_text *text, } static void -fz_java_device_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shd, const fz_matrix *ctm, float alpha) +fz_java_device_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shd, const fz_matrix *ctm, float alpha, const fz_color_params *color_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; @@ -1979,7 +2003,7 @@ fz_java_device_fill_shade(fz_context *ctx, fz_device *dev, fz_shade *shd, const } static void -fz_java_device_fill_image(fz_context *ctx, fz_device *dev, fz_image *img, const fz_matrix *ctm, float alpha) +fz_java_device_fill_image(fz_context *ctx, fz_device *dev, fz_image *img, const fz_matrix *ctm, float alpha, const fz_color_params *color_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; @@ -1992,7 +2016,7 @@ fz_java_device_fill_image(fz_context *ctx, fz_device *dev, fz_image *img, const } static void -fz_java_device_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *img, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha) +fz_java_device_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *img, const fz_matrix *ctm, fz_colorspace *cs, const float *color, float alpha, const fz_color_params *cs_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; @@ -2000,8 +2024,9 @@ fz_java_device_fill_image_mask(fz_context *ctx, fz_device *dev, fz_image *img, c jobject jctm = to_Matrix(ctx, env, ctm); jobject jcs = to_ColorSpace(ctx, env, cs); jfloatArray jcolor = to_jfloatArray(ctx, env, color, cs ? fz_colorspace_n(ctx, cs) : FZ_MAX_COLORS); + int jcp = to_ColorParams_safe(ctx, env, cs_params); - (*env)->CallVoidMethod(env, jdev->self, mid_Device_fillImageMask, jimg, jctm, jcs, jcolor, alpha); + (*env)->CallVoidMethod(env, jdev->self, mid_Device_fillImageMask, jimg, jctm, jcs, jcolor, alpha, jcp); if ((*env)->ExceptionCheck(env)) fz_throw_java(ctx, env); } @@ -2031,15 +2056,16 @@ fz_java_device_pop_clip(fz_context *ctx, fz_device *dev) } static void -fz_java_device_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *rect, int luminosity, fz_colorspace *cs, const float *bc) +fz_java_device_begin_mask(fz_context *ctx, fz_device *dev, const fz_rect *rect, int luminosity, fz_colorspace *cs, const float *bc, const fz_color_params *cs_params) { fz_java_device *jdev = (fz_java_device *)dev; JNIEnv *env = jdev->env; jobject jrect = to_Rect(ctx, env, rect); jobject jcs = to_ColorSpace(ctx, env, cs); jfloatArray jbc = to_jfloatArray(ctx, env, bc, cs ? fz_colorspace_n(ctx, cs) : FZ_MAX_COLORS); + int jcp = to_ColorParams_safe(ctx, env, cs_params); - (*env)->CallVoidMethod(env, jdev->self, mid_Device_beginMask, jrect, (jint)luminosity, jcs, jbc); + (*env)->CallVoidMethod(env, jdev->self, mid_Device_beginMask, jrect, (jint)luminosity, jcs, jbc, jcp); if ((*env)->ExceptionCheck(env)) fz_throw_java(ctx, env); } @@ -2290,7 +2316,7 @@ FUN(NativeDevice_close)(JNIEnv *env, jobject self) } JNIEXPORT void JNICALL -FUN(NativeDevice_fillPath)(JNIEnv *env, jobject self, jobject jpath, jboolean even_odd, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha) +FUN(NativeDevice_fillPath)(JNIEnv *env, jobject self, jobject jpath, jboolean even_odd, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); @@ -2299,6 +2325,7 @@ FUN(NativeDevice_fillPath)(JNIEnv *env, jobject self, jobject jpath, jboolean ev fz_colorspace *cs = from_ColorSpace(env, jcs); float color[FZ_MAX_COLORS]; NativeDeviceInfo *info; + fz_color_params cp = from_ColorParams_safe(env, jcp); if (!ctx || !dev) return; if (!path) { jni_throw_arg(env, "path must not be null"); return; } @@ -2306,7 +2333,7 @@ FUN(NativeDevice_fillPath)(JNIEnv *env, jobject self, jobject jpath, jboolean ev info = lockNativeDevice(env, self); fz_try(ctx) - fz_fill_path(ctx, dev, path, even_odd, &ctm, cs, color, alpha); + fz_fill_path(ctx, dev, path, even_odd, &ctm, cs, color, alpha, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -2314,7 +2341,7 @@ FUN(NativeDevice_fillPath)(JNIEnv *env, jobject self, jobject jpath, jboolean ev } JNIEXPORT void JNICALL -FUN(NativeDevice_strokePath)(JNIEnv *env, jobject self, jobject jpath, jobject jstroke, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha) +FUN(NativeDevice_strokePath)(JNIEnv *env, jobject self, jobject jpath, jobject jstroke, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); @@ -2322,6 +2349,7 @@ FUN(NativeDevice_strokePath)(JNIEnv *env, jobject self, jobject jpath, jobject j fz_stroke_state *stroke = from_StrokeState(env, jstroke); fz_matrix ctm = from_Matrix(env, jctm); fz_colorspace *cs = from_ColorSpace(env, jcs); + fz_color_params cp = from_ColorParams_safe(env, jcp); float color[FZ_MAX_COLORS]; NativeDeviceInfo *info; @@ -2332,7 +2360,7 @@ FUN(NativeDevice_strokePath)(JNIEnv *env, jobject self, jobject jpath, jobject j info = lockNativeDevice(env, self); fz_try(ctx) - fz_stroke_path(ctx, dev, path, stroke, &ctm, cs, color, alpha); + fz_stroke_path(ctx, dev, path, stroke, &ctm, cs, color, alpha, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -2384,13 +2412,14 @@ FUN(NativeDevice_clipStrokePath)(JNIEnv *env, jobject self, jobject jpath, jobje } JNIEXPORT void JNICALL -FUN(NativeDevice_fillText)(JNIEnv *env, jobject self, jobject jtext, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha) +FUN(NativeDevice_fillText)(JNIEnv *env, jobject self, jobject jtext, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); fz_text *text = from_Text(env, jtext); fz_matrix ctm = from_Matrix(env, jctm); fz_colorspace *cs = from_ColorSpace(env, jcs); + fz_color_params cp = from_ColorParams_safe(env, jcp); float color[FZ_MAX_COLORS]; NativeDeviceInfo *info; @@ -2400,7 +2429,7 @@ FUN(NativeDevice_fillText)(JNIEnv *env, jobject self, jobject jtext, jobject jct info = lockNativeDevice(env, self); fz_try(ctx) - fz_fill_text(ctx, dev, text, &ctm, cs, color, alpha); + fz_fill_text(ctx, dev, text, &ctm, cs, color, alpha, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -2408,7 +2437,7 @@ FUN(NativeDevice_fillText)(JNIEnv *env, jobject self, jobject jtext, jobject jct } JNIEXPORT void JNICALL -FUN(NativeDevice_strokeText)(JNIEnv *env, jobject self, jobject jtext, jobject jstroke, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha) +FUN(NativeDevice_strokeText)(JNIEnv *env, jobject self, jobject jtext, jobject jstroke, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); @@ -2416,6 +2445,7 @@ FUN(NativeDevice_strokeText)(JNIEnv *env, jobject self, jobject jtext, jobject j fz_stroke_state *stroke = from_StrokeState(env, jstroke); fz_matrix ctm = from_Matrix(env, jctm); fz_colorspace *cs = from_ColorSpace(env, jcs); + fz_color_params cp = from_ColorParams_safe(env, jcp); float color[FZ_MAX_COLORS]; NativeDeviceInfo *info; @@ -2426,7 +2456,7 @@ FUN(NativeDevice_strokeText)(JNIEnv *env, jobject self, jobject jtext, jobject j info = lockNativeDevice(env, self); fz_try(ctx) - fz_stroke_text(ctx, dev, text, stroke, &ctm, cs, color, alpha); + fz_stroke_text(ctx, dev, text, stroke, &ctm, cs, color, alpha, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -2499,12 +2529,13 @@ FUN(NativeDevice_ignoreText)(JNIEnv *env, jobject self, jobject jtext, jobject j } JNIEXPORT void JNICALL -FUN(NativeDevice_fillShade)(JNIEnv *env, jobject self, jobject jshd, jobject jctm, jfloat alpha) +FUN(NativeDevice_fillShade)(JNIEnv *env, jobject self, jobject jshd, jobject jctm, jfloat alpha, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); fz_shade *shd = from_Shade(env, jshd); fz_matrix ctm = from_Matrix(env, jctm); + fz_color_params cp = from_ColorParams_safe(env, jcp); NativeDeviceInfo *info; if (!ctx || !dev) return; @@ -2512,7 +2543,7 @@ FUN(NativeDevice_fillShade)(JNIEnv *env, jobject self, jobject jshd, jobject jct info = lockNativeDevice(env, self); fz_try(ctx) - fz_fill_shade(ctx, dev, shd, &ctm, alpha); + fz_fill_shade(ctx, dev, shd, &ctm, alpha, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -2520,12 +2551,13 @@ FUN(NativeDevice_fillShade)(JNIEnv *env, jobject self, jobject jshd, jobject jct } JNIEXPORT void JNICALL -FUN(NativeDevice_fillImage)(JNIEnv *env, jobject self, jobject jimg, jobject jctm, jfloat alpha) +FUN(NativeDevice_fillImage)(JNIEnv *env, jobject self, jobject jimg, jobject jctm, jfloat alpha, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); fz_image *img = from_Image(env, jimg); fz_matrix ctm = from_Matrix(env, jctm); + fz_color_params cp = from_ColorParams_safe(env, jcp); NativeDeviceInfo *info; if (!ctx || !dev) return; @@ -2533,7 +2565,7 @@ FUN(NativeDevice_fillImage)(JNIEnv *env, jobject self, jobject jimg, jobject jct info = lockNativeDevice(env, self); fz_try(ctx) - fz_fill_image(ctx, dev, img, &ctm, alpha); + fz_fill_image(ctx, dev, img, &ctm, alpha, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -2541,13 +2573,14 @@ FUN(NativeDevice_fillImage)(JNIEnv *env, jobject self, jobject jimg, jobject jct } JNIEXPORT void JNICALL -FUN(NativeDevice_fillImageMask)(JNIEnv *env, jobject self, jobject jimg, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha) +FUN(NativeDevice_fillImageMask)(JNIEnv *env, jobject self, jobject jimg, jobject jctm, jobject jcs, jfloatArray jcolor, jfloat alpha, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); fz_image *img = from_Image(env, jimg); fz_matrix ctm = from_Matrix(env, jctm); fz_colorspace *cs = from_ColorSpace(env, jcs); + fz_color_params cp = from_ColorParams_safe(env, jcp); float color[FZ_MAX_COLORS]; NativeDeviceInfo *info; @@ -2557,7 +2590,7 @@ FUN(NativeDevice_fillImageMask)(JNIEnv *env, jobject self, jobject jimg, jobject info = lockNativeDevice(env, self); fz_try(ctx) - fz_fill_image_mask(ctx, dev, img, &ctm, cs, color, alpha); + fz_fill_image_mask(ctx, dev, img, &ctm, cs, color, alpha, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -2604,12 +2637,13 @@ FUN(NativeDevice_popClip)(JNIEnv *env, jobject self) } JNIEXPORT void JNICALL -FUN(NativeDevice_beginMask)(JNIEnv *env, jobject self, jobject jrect, jboolean luminosity, jobject jcs, jfloatArray jcolor) +FUN(NativeDevice_beginMask)(JNIEnv *env, jobject self, jobject jrect, jboolean luminosity, jobject jcs, jfloatArray jcolor, jint jcp) { fz_context *ctx = get_context(env); fz_device *dev = from_Device(env, self); fz_rect rect = from_Rect(env, jrect); fz_colorspace *cs = from_ColorSpace(env, jcs); + fz_color_params cp = from_ColorParams_safe(env, jcp); float color[FZ_MAX_COLORS]; NativeDeviceInfo *info; @@ -2618,7 +2652,7 @@ FUN(NativeDevice_beginMask)(JNIEnv *env, jobject self, jobject jrect, jboolean l info = lockNativeDevice(env, self); fz_try(ctx) - fz_begin_mask(ctx, dev, &rect, luminosity, cs, color); + fz_begin_mask(ctx, dev, &rect, luminosity, cs, color, &cp); fz_always(ctx) unlockNativeDevice(env, info); fz_catch(ctx) @@ -8123,7 +8157,7 @@ FUN(PDFGraftMap_graftObject)(JNIEnv *env, jobject self, jobject jobj) /* PDFPage interface */ JNIEXPORT jobject JNICALL -FUN(PDFPage_createAnnotation)(JNIEnv *env, jobject self, int subtype) +FUN(PDFPage_createAnnotation)(JNIEnv *env, jobject self, jint subtype) { fz_context *ctx = get_context(env); pdf_page *page = from_PDFPage(env, self); diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h index cdcebc50..d7355376 100644 --- a/platform/java/mupdf_native.h +++ b/platform/java/mupdf_native.h @@ -208,6 +208,34 @@ extern "C" { } #endif #endif +/* Header for class com_artifex_mupdf_fitz_ColorParams_RenderingIntent */ + +#ifndef _Included_com_artifex_mupdf_fitz_ColorParams_RenderingIntent +#define _Included_com_artifex_mupdf_fitz_ColorParams_RenderingIntent +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_artifex_mupdf_fitz_ColorParams */ + +#ifndef _Included_com_artifex_mupdf_fitz_ColorParams +#define _Included_com_artifex_mupdf_fitz_ColorParams +#ifdef __cplusplus +extern "C" { +#endif +#undef com_artifex_mupdf_fitz_ColorParams_BP +#define com_artifex_mupdf_fitz_ColorParams_BP 32L +#undef com_artifex_mupdf_fitz_ColorParams_OP +#define com_artifex_mupdf_fitz_ColorParams_OP 64L +#undef com_artifex_mupdf_fitz_ColorParams_OPM +#define com_artifex_mupdf_fitz_ColorParams_OPM 128L +#ifdef __cplusplus +} +#endif +#endif /* Header for class com_artifex_mupdf_fitz_ColorSpace */ #ifndef _Included_com_artifex_mupdf_fitz_ColorSpace @@ -1121,18 +1149,18 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_close /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: fillPath - * Signature: (Lcom/artifex/mupdf/fitz/Path;ZLcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FF)V + * Signature: (Lcom/artifex/mupdf/fitz/Path;ZLcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FFI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_fillPath - (JNIEnv *, jobject, jobject, jboolean, jobject, jobject, jfloatArray, jfloat); + (JNIEnv *, jobject, jobject, jboolean, jobject, jobject, jfloatArray, jfloat, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: strokePath - * Signature: (Lcom/artifex/mupdf/fitz/Path;Lcom/artifex/mupdf/fitz/StrokeState;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FF)V + * Signature: (Lcom/artifex/mupdf/fitz/Path;Lcom/artifex/mupdf/fitz/StrokeState;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FFI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_strokePath - (JNIEnv *, jobject, jobject, jobject, jobject, jobject, jfloatArray, jfloat); + (JNIEnv *, jobject, jobject, jobject, jobject, jobject, jfloatArray, jfloat, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice @@ -1153,18 +1181,18 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_clipStrokePath /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: fillText - * Signature: (Lcom/artifex/mupdf/fitz/Text;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FF)V + * Signature: (Lcom/artifex/mupdf/fitz/Text;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FFI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_fillText - (JNIEnv *, jobject, jobject, jobject, jobject, jfloatArray, jfloat); + (JNIEnv *, jobject, jobject, jobject, jobject, jfloatArray, jfloat, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: strokeText - * Signature: (Lcom/artifex/mupdf/fitz/Text;Lcom/artifex/mupdf/fitz/StrokeState;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FF)V + * Signature: (Lcom/artifex/mupdf/fitz/Text;Lcom/artifex/mupdf/fitz/StrokeState;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FFI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_strokeText - (JNIEnv *, jobject, jobject, jobject, jobject, jobject, jfloatArray, jfloat); + (JNIEnv *, jobject, jobject, jobject, jobject, jobject, jfloatArray, jfloat, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice @@ -1193,26 +1221,26 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_ignoreText /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: fillShade - * Signature: (Lcom/artifex/mupdf/fitz/Shade;Lcom/artifex/mupdf/fitz/Matrix;F)V + * Signature: (Lcom/artifex/mupdf/fitz/Shade;Lcom/artifex/mupdf/fitz/Matrix;FI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_fillShade - (JNIEnv *, jobject, jobject, jobject, jfloat); + (JNIEnv *, jobject, jobject, jobject, jfloat, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: fillImage - * Signature: (Lcom/artifex/mupdf/fitz/Image;Lcom/artifex/mupdf/fitz/Matrix;F)V + * Signature: (Lcom/artifex/mupdf/fitz/Image;Lcom/artifex/mupdf/fitz/Matrix;FI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_fillImage - (JNIEnv *, jobject, jobject, jobject, jfloat); + (JNIEnv *, jobject, jobject, jobject, jfloat, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: fillImageMask - * Signature: (Lcom/artifex/mupdf/fitz/Image;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FF)V + * Signature: (Lcom/artifex/mupdf/fitz/Image;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;[FFI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_fillImageMask - (JNIEnv *, jobject, jobject, jobject, jobject, jfloatArray, jfloat); + (JNIEnv *, jobject, jobject, jobject, jobject, jfloatArray, jfloat, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice @@ -1233,10 +1261,10 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_popClip /* * Class: com_artifex_mupdf_fitz_NativeDevice * Method: beginMask - * Signature: (Lcom/artifex/mupdf/fitz/Rect;ZLcom/artifex/mupdf/fitz/ColorSpace;[F)V + * Signature: (Lcom/artifex/mupdf/fitz/Rect;ZLcom/artifex/mupdf/fitz/ColorSpace;[FI)V */ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_beginMask - (JNIEnv *, jobject, jobject, jboolean, jobject, jfloatArray); + (JNIEnv *, jobject, jobject, jboolean, jobject, jfloatArray, jint); /* * Class: com_artifex_mupdf_fitz_NativeDevice @@ -1293,6 +1321,263 @@ extern "C" { } #endif #endif +/* Header for class com_artifex_mupdf_fitz_Page */ + +#ifndef _Included_com_artifex_mupdf_fitz_Page +#define _Included_com_artifex_mupdf_fitz_Page +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: finalize + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_finalize + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: getBounds + * Signature: ()Lcom/artifex/mupdf/fitz/Rect; + */ +JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_getBounds + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: toPixmap + * Signature: (Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;Z)Lcom/artifex/mupdf/fitz/Pixmap; + */ +JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toPixmap + (JNIEnv *, jobject, jobject, jobject, jboolean); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: run + * Signature: (Lcom/artifex/mupdf/fitz/Device;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/Cookie;)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_run + (JNIEnv *, jobject, jobject, jobject, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: runPageContents + * Signature: (Lcom/artifex/mupdf/fitz/Device;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/Cookie;)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_runPageContents + (JNIEnv *, jobject, jobject, jobject, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: getAnnotations + * Signature: ()[Lcom/artifex/mupdf/fitz/Annotation; + */ +JNIEXPORT jobjectArray JNICALL Java_com_artifex_mupdf_fitz_Page_getAnnotations + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: getLinks + * Signature: ()[Lcom/artifex/mupdf/fitz/Link; + */ +JNIEXPORT jobjectArray JNICALL Java_com_artifex_mupdf_fitz_Page_getLinks + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: toDisplayList + * Signature: (Z)Lcom/artifex/mupdf/fitz/DisplayList; + */ +JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toDisplayList + (JNIEnv *, jobject, jboolean); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: toStructuredText + * Signature: (Ljava/lang/String;)Lcom/artifex/mupdf/fitz/StructuredText; + */ +JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toStructuredText + (JNIEnv *, jobject, jstring); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: search + * Signature: (Ljava/lang/String;)[Lcom/artifex/mupdf/fitz/Rect; + */ +JNIEXPORT jobjectArray JNICALL Java_com_artifex_mupdf_fitz_Page_search + (JNIEnv *, jobject, jstring); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: textAsHtml + * Signature: ()[B + */ +JNIEXPORT jbyteArray JNICALL Java_com_artifex_mupdf_fitz_Page_textAsHtml + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: countSeparations + * Signature: ()I + */ +JNIEXPORT jint JNICALL Java_com_artifex_mupdf_fitz_Page_countSeparations + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: getSeparation + * Signature: (I)Lcom/artifex/mupdf/fitz/Separation; + */ +JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_getSeparation + (JNIEnv *, jobject, jint); + +/* + * Class: com_artifex_mupdf_fitz_Page + * Method: enableSeparation + * Signature: (IZ)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_enableSeparation + (JNIEnv *, jobject, jint, jboolean); + +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_artifex_mupdf_fitz_Path */ + +#ifndef _Included_com_artifex_mupdf_fitz_Path +#define _Included_com_artifex_mupdf_fitz_Path +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: finalize + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_finalize + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: newNative + * Signature: ()J + */ +JNIEXPORT jlong JNICALL Java_com_artifex_mupdf_fitz_Path_newNative + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: cloneNative + * Signature: ()J + */ +JNIEXPORT jlong JNICALL Java_com_artifex_mupdf_fitz_Path_cloneNative + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: currentPoint + * Signature: ()Lcom/artifex/mupdf/fitz/Point; + */ +JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Path_currentPoint + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: moveTo + * Signature: (FF)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_moveTo + (JNIEnv *, jobject, jfloat, jfloat); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: lineTo + * Signature: (FF)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_lineTo + (JNIEnv *, jobject, jfloat, jfloat); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: curveTo + * Signature: (FFFFFF)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_curveTo + (JNIEnv *, jobject, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: curveToV + * Signature: (FFFF)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_curveToV + (JNIEnv *, jobject, jfloat, jfloat, jfloat, jfloat); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: curveToY + * Signature: (FFFF)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_curveToY + (JNIEnv *, jobject, jfloat, jfloat, jfloat, jfloat); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: rect + * Signature: (IIII)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_rect + (JNIEnv *, jobject, jint, jint, jint, jint); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: closePath + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_closePath + (JNIEnv *, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: transform + * Signature: (Lcom/artifex/mupdf/fitz/Matrix;)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_transform + (JNIEnv *, jobject, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: getBounds + * Signature: (Lcom/artifex/mupdf/fitz/StrokeState;Lcom/artifex/mupdf/fitz/Matrix;)Lcom/artifex/mupdf/fitz/Rect; + */ +JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Path_getBounds + (JNIEnv *, jobject, jobject, jobject); + +/* + * Class: com_artifex_mupdf_fitz_Path + * Method: walk + * Signature: (Lcom/artifex/mupdf/fitz/PathWalker;)V + */ +JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_walk + (JNIEnv *, jobject, jobject); + +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_artifex_mupdf_fitz_PathWalker */ + +#ifndef _Included_com_artifex_mupdf_fitz_PathWalker +#define _Included_com_artifex_mupdf_fitz_PathWalker +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif /* Header for class com_artifex_mupdf_fitz_PDFAnnotation */ #ifndef _Included_com_artifex_mupdf_fitz_PDFAnnotation @@ -1722,7 +2007,7 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_PDFDocument_deleteObject /* * Class: com_artifex_mupdf_fitz_PDFDocument * Method: newPDFGraftMap - * Signature: (Lcom/artifex/mupdf/fitz/PDFDocument)Lcom/artifex/mupdf/fitz/PDFGraftMap; + * Signature: ()Lcom/artifex/mupdf/fitz/PDFGraftMap; */ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_PDFDocument_newPDFGraftMap (JNIEnv *, jobject); @@ -1730,7 +2015,7 @@ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_PDFDocument_newPDFGraftMap /* * Class: com_artifex_mupdf_fitz_PDFDocument * Method: graftObject - * Signature: (Lcom/artifex/mupdf/fitz/PDFDocument;Lcom/artifex/mupdf/fitz/PDFObject)Lcom/artifex/mupdf/fitz/PDFObject; + * Signature: (Lcom/artifex/mupdf/fitz/PDFObject;)Lcom/artifex/mupdf/fitz/PDFObject; */ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_PDFDocument_graftObject (JNIEnv *, jobject, jobject); @@ -1853,10 +2138,10 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_PDFGraftMap_finalize /* * Class: com_artifex_mupdf_fitz_PDFGraftMap * Method: graftObject - * Signature: (Lcom/artifex/mupdf/fitz/PDFGraftMap;Lcom/artifex/mupdf/fitz/PDFObject;)Lcom/artifex/mupdf/fitz/PDFObject; + * Signature: (Lcom/artifex/mupdf/fitz/PDFObject;)Lcom/artifex/mupdf/fitz/PDFObject; */ JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_PDFGraftMap_graftObject - (JNIEnv *, jobject, jobject, jobject); + (JNIEnv *, jobject, jobject); #ifdef __cplusplus } @@ -2348,263 +2633,6 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_PDFPage_deleteAnnotation } #endif #endif -/* Header for class com_artifex_mupdf_fitz_Page */ - -#ifndef _Included_com_artifex_mupdf_fitz_Page -#define _Included_com_artifex_mupdf_fitz_Page -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_finalize - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: getBounds - * Signature: ()Lcom/artifex/mupdf/fitz/Rect; - */ -JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_getBounds - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: toPixmap - * Signature: (Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/ColorSpace;Z)Lcom/artifex/mupdf/fitz/Pixmap; - */ -JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toPixmap - (JNIEnv *, jobject, jobject, jobject, jboolean); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: run - * Signature: (Lcom/artifex/mupdf/fitz/Device;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/Cookie;)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_run - (JNIEnv *, jobject, jobject, jobject, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: runPageContents - * Signature: (Lcom/artifex/mupdf/fitz/Device;Lcom/artifex/mupdf/fitz/Matrix;Lcom/artifex/mupdf/fitz/Cookie;)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_runPageContents - (JNIEnv *, jobject, jobject, jobject, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: getAnnotations - * Signature: ()[Lcom/artifex/mupdf/fitz/Annotation; - */ -JNIEXPORT jobjectArray JNICALL Java_com_artifex_mupdf_fitz_Page_getAnnotations - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: getLinks - * Signature: ()[Lcom/artifex/mupdf/fitz/Link; - */ -JNIEXPORT jobjectArray JNICALL Java_com_artifex_mupdf_fitz_Page_getLinks - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: toDisplayList - * Signature: (Z)Lcom/artifex/mupdf/fitz/DisplayList; - */ -JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toDisplayList - (JNIEnv *, jobject, jboolean); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: toStructuredText - * Signature: (Ljava/lang/String;)Lcom/artifex/mupdf/fitz/StructuredText; - */ -JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_toStructuredText - (JNIEnv *, jobject, jstring); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: search - * Signature: (Ljava/lang/String;)[Lcom/artifex/mupdf/fitz/Rect; - */ -JNIEXPORT jobjectArray JNICALL Java_com_artifex_mupdf_fitz_Page_search - (JNIEnv *, jobject, jstring); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: textAsHtml - * Signature: ()[B - */ -JNIEXPORT jbyteArray JNICALL Java_com_artifex_mupdf_fitz_Page_textAsHtml - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: countSeparations - * Signature: ()I - */ -JNIEXPORT jint JNICALL Java_com_artifex_mupdf_fitz_Page_countSeparations - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: getSeparation - * Signature: (I)Lcom/artifex/mupdf/fitz/Separation; - */ -JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Page_getSeparation - (JNIEnv *, jobject, jint); - -/* - * Class: com_artifex_mupdf_fitz_Page - * Method: enableSeparation - * Signature: (IZ)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Page_enableSeparation - (JNIEnv *, jobject, jint, jboolean); - -#ifdef __cplusplus -} -#endif -#endif -/* Header for class com_artifex_mupdf_fitz_Path */ - -#ifndef _Included_com_artifex_mupdf_fitz_Path -#define _Included_com_artifex_mupdf_fitz_Path -#ifdef __cplusplus -extern "C" { -#endif -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: finalize - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_finalize - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: newNative - * Signature: ()J - */ -JNIEXPORT jlong JNICALL Java_com_artifex_mupdf_fitz_Path_newNative - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: cloneNative - * Signature: ()J - */ -JNIEXPORT jlong JNICALL Java_com_artifex_mupdf_fitz_Path_cloneNative - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: currentPoint - * Signature: ()Lcom/artifex/mupdf/fitz/Point; - */ -JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Path_currentPoint - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: moveTo - * Signature: (FF)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_moveTo - (JNIEnv *, jobject, jfloat, jfloat); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: lineTo - * Signature: (FF)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_lineTo - (JNIEnv *, jobject, jfloat, jfloat); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: curveTo - * Signature: (FFFFFF)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_curveTo - (JNIEnv *, jobject, jfloat, jfloat, jfloat, jfloat, jfloat, jfloat); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: curveToV - * Signature: (FFFF)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_curveToV - (JNIEnv *, jobject, jfloat, jfloat, jfloat, jfloat); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: curveToY - * Signature: (FFFF)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_curveToY - (JNIEnv *, jobject, jfloat, jfloat, jfloat, jfloat); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: rect - * Signature: (IIII)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_rect - (JNIEnv *, jobject, jint, jint, jint, jint); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: closePath - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_closePath - (JNIEnv *, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: transform - * Signature: (Lcom/artifex/mupdf/fitz/Matrix;)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_transform - (JNIEnv *, jobject, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: getBounds - * Signature: (Lcom/artifex/mupdf/fitz/StrokeState;Lcom/artifex/mupdf/fitz/Matrix;)Lcom/artifex/mupdf/fitz/Rect; - */ -JNIEXPORT jobject JNICALL Java_com_artifex_mupdf_fitz_Path_getBounds - (JNIEnv *, jobject, jobject, jobject); - -/* - * Class: com_artifex_mupdf_fitz_Path - * Method: walk - * Signature: (Lcom/artifex/mupdf/fitz/PathWalker;)V - */ -JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Path_walk - (JNIEnv *, jobject, jobject); - -#ifdef __cplusplus -} -#endif -#endif -/* Header for class com_artifex_mupdf_fitz_PathWalker */ - -#ifndef _Included_com_artifex_mupdf_fitz_PathWalker -#define _Included_com_artifex_mupdf_fitz_PathWalker -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif /* Header for class com_artifex_mupdf_fitz_Pixmap */ #ifndef _Included_com_artifex_mupdf_fitz_Pixmap @@ -2938,6 +2966,50 @@ JNIEXPORT jfloatArray JNICALL Java_com_artifex_mupdf_fitz_StrokeState_getDashes } #endif #endif +/* Header for class com_artifex_mupdf_fitz_StructuredText_TextBlock */ + +#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextBlock +#define _Included_com_artifex_mupdf_fitz_StructuredText_TextBlock +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_artifex_mupdf_fitz_StructuredText_TextChar */ + +#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextChar +#define _Included_com_artifex_mupdf_fitz_StructuredText_TextChar +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_artifex_mupdf_fitz_StructuredText_TextLine */ + +#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextLine +#define _Included_com_artifex_mupdf_fitz_StructuredText_TextLine +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif +/* Header for class com_artifex_mupdf_fitz_StructuredText_TextSpan */ + +#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextSpan +#define _Included_com_artifex_mupdf_fitz_StructuredText_TextSpan +#ifdef __cplusplus +extern "C" { +#endif +#ifdef __cplusplus +} +#endif +#endif /* Header for class com_artifex_mupdf_fitz_StructuredText */ #ifndef _Included_com_artifex_mupdf_fitz_StructuredText @@ -2989,50 +3061,6 @@ JNIEXPORT jobjectArray JNICALL Java_com_artifex_mupdf_fitz_StructuredText_getBlo } #endif #endif -/* Header for class com_artifex_mupdf_fitz_StructuredText_TextChar */ - -#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextChar -#define _Included_com_artifex_mupdf_fitz_StructuredText_TextChar -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif -/* Header for class com_artifex_mupdf_fitz_StructuredText_TextSpan */ - -#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextSpan -#define _Included_com_artifex_mupdf_fitz_StructuredText_TextSpan -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif -/* Header for class com_artifex_mupdf_fitz_StructuredText_TextLine */ - -#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextLine -#define _Included_com_artifex_mupdf_fitz_StructuredText_TextLine -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif -/* Header for class com_artifex_mupdf_fitz_StructuredText_TextBlock */ - -#ifndef _Included_com_artifex_mupdf_fitz_StructuredText_TextBlock -#define _Included_com_artifex_mupdf_fitz_StructuredText_TextBlock -#ifdef __cplusplus -extern "C" { -#endif -#ifdef __cplusplus -} -#endif -#endif /* Header for class com_artifex_mupdf_fitz_Text */ #ifndef _Included_com_artifex_mupdf_fitz_Text @@ -3119,11 +3147,11 @@ extern "C" { extern "C" { #endif #undef com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -#define com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -3042686055658047285LL +#define com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -3042686055658047285i64 #undef com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -#define com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -3387516993124229948LL +#define com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -3387516993124229948i64 #undef com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -#define com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -7034897190745766939LL +#define com_artifex_mupdf_fitz_TryLaterException_serialVersionUID -7034897190745766939i64 #ifdef __cplusplus } #endif diff --git a/platform/java/src/com/artifex/mupdf/fitz/ColorParams.java b/platform/java/src/com/artifex/mupdf/fitz/ColorParams.java new file mode 100644 index 00000000..2a8d781b --- /dev/null +++ b/platform/java/src/com/artifex/mupdf/fitz/ColorParams.java @@ -0,0 +1,51 @@ +package com.artifex.mupdf.fitz; + +public final class ColorParams +{ + public enum RenderingIntent { + PERCEPTUAL, + RELATIVE_COLORIMETRIC, + SATURATION, + ABSOLUTE_COLORIMETRIC + } + public static final int BP = 32; + public static final int OP = 64; + public static final int OPM = 128; + + public static RenderingIntent RI(int flags) { + switch (flags>>3) { + default: + case 0: return RenderingIntent.PERCEPTUAL; + case 1: return RenderingIntent.RELATIVE_COLORIMETRIC; + case 2: return RenderingIntent.SATURATION; + case 3: return RenderingIntent.ABSOLUTE_COLORIMETRIC; + } + } + + public static boolean BP(int flags) { + return (flags & BP) != 0; + } + + public static boolean OP(int flags) { + return (flags & OP) != 0; + } + + public static boolean OPM(int flags) { + return (flags & OPM) != 0; + } + + public static int pack(RenderingIntent ri, boolean bp, boolean op, boolean opm) { + int flags; + switch (ri) { + default: + case PERCEPTUAL: flags = 0; break; + case RELATIVE_COLORIMETRIC: flags = 1; break; + case SATURATION: flags = 2; break; + case ABSOLUTE_COLORIMETRIC: flags = 3; break; + } + if (bp) flags |= BP; + if (op) flags |= OP; + if (opm) flags |= OPM; + return flags; + } +} diff --git a/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java index 0d2b9159..910b8ec8 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java +++ b/platform/java/src/com/artifex/mupdf/fitz/NativeDevice.java @@ -19,25 +19,26 @@ public class NativeDevice extends Device public native final void close(); - public native final void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha); - public native final void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha); + public native final void fillPath(Path path, boolean evenOdd, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + public native final void strokePath(Path path, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); public native final void clipPath(Path path, boolean evenOdd, Matrix ctm); public native final void clipStrokePath(Path path, StrokeState stroke, Matrix ctm); - public native final void fillText(Text text, Matrix ctm, ColorSpace cs, float color[], float alpha); - public native final void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha); + public native final void fillText(Text text, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + public native final void strokeText(Text text, StrokeState stroke, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); public native final void clipText(Text text, Matrix ctm); public native final void clipStrokeText(Text text, StrokeState stroke, Matrix ctm); public native final void ignoreText(Text text, Matrix ctm); - public native final void fillShade(Shade shd, Matrix ctm, float alpha); - public native final void fillImage(Image img, Matrix ctm, float alpha); - public native final void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float color[], float alpha); + public native final void fillShade(Shade shd, Matrix ctm, float alpha, int cp); + public native final void fillImage(Image img, Matrix ctm, float alpha, int cp); + public native final void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float color[], float alpha, int cp); + /* FIXME: Why no scissor? */ public native final void clipImageMask(Image img, Matrix ctm); public native final void popClip(); - public native final void beginMask(Rect rect, boolean luminosity, ColorSpace cs, float bc[]); + public native final void beginMask(Rect rect, boolean luminosity, ColorSpace cs, float bc[], int cp); public native final void endMask(); public native final void beginGroup(Rect rect, boolean isolated, boolean knockout, int blendmode, float alpha); public native final void endGroup(); |