1 files changed, 18 insertions, 146 deletions
diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h
index 144bfefb..0e581fda 100644
--- a/platform/java/mupdf_native.h
+++ b/platform/java/mupdf_native.h
@@ -362,28 +362,6 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Cookie_abort
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_Device_FLAG_MASK
-#define com_artifex_mupdf_fitz_Device_FLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_Device_FLAG_COLOR
-#define com_artifex_mupdf_fitz_Device_FLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_Device_FLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_Device_FLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_Device_FLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_Device_FLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_Device_FLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_Device_FLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_Device_FLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_Device_FLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_Device_FLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_Device_FLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FLAG_LINEWIDTH_UNDEFINED 1024L
 #undef com_artifex_mupdf_fitz_Device_BLEND_NORMAL
 #define com_artifex_mupdf_fitz_Device_BLEND_NORMAL 0L
 #undef com_artifex_mupdf_fitz_Device_BLEND_MULTIPLY
@@ -416,16 +394,6 @@ extern "C" {
 #define com_artifex_mupdf_fitz_Device_BLEND_COLOR 14L
 #undef com_artifex_mupdf_fitz_Device_BLEND_LUMINOSITY
 #define com_artifex_mupdf_fitz_Device_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_Device_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_Device_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_Device_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_Device_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_Device_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_Device_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_Device_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_Device_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_Device_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_Device_IGNORE_SHADE 2L
 /*
  * Class:     com_artifex_mupdf_fitz_Device
  * Method:    finalize
@@ -512,28 +480,6 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_DisplayList_run
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_MASK
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_COLOR
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FLAG_LINEWIDTH_UNDEFINED 1024L
 #undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_NORMAL
 #define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_NORMAL 0L
 #undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_MULTIPLY
@@ -566,16 +512,6 @@ extern "C" {
 #define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_COLOR 14L
 #undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_LUMINOSITY
 #define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_DisplayListDevice_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_DisplayListDevice_IGNORE_SHADE 2L
 /*
  * Class:     com_artifex_mupdf_fitz_DisplayListDevice
  * Method:    newNative
@@ -793,28 +729,6 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_DocumentWriter_close
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_MASK
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_COLOR
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_DrawDevice_FLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FLAG_LINEWIDTH_UNDEFINED 1024L
 #undef com_artifex_mupdf_fitz_DrawDevice_BLEND_NORMAL
 #define com_artifex_mupdf_fitz_DrawDevice_BLEND_NORMAL 0L
 #undef com_artifex_mupdf_fitz_DrawDevice_BLEND_MULTIPLY
@@ -847,16 +761,6 @@ extern "C" {
 #define com_artifex_mupdf_fitz_DrawDevice_BLEND_COLOR 14L
 #undef com_artifex_mupdf_fitz_DrawDevice_BLEND_LUMINOSITY
 #define com_artifex_mupdf_fitz_DrawDevice_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_DrawDevice_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_DrawDevice_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_DrawDevice_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_DrawDevice_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_DrawDevice_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_DrawDevice_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_DrawDevice_IGNORE_SHADE 2L
 /*
  * Class:     com_artifex_mupdf_fitz_DrawDevice
  * Method:    newNative
@@ -1097,28 +1001,6 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_MASK
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_COLOR
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_NativeDevice_FLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FLAG_LINEWIDTH_UNDEFINED 1024L
 #undef com_artifex_mupdf_fitz_NativeDevice_BLEND_NORMAL
 #define com_artifex_mupdf_fitz_NativeDevice_BLEND_NORMAL 0L
 #undef com_artifex_mupdf_fitz_NativeDevice_BLEND_MULTIPLY
@@ -1151,16 +1033,6 @@ extern "C" {
 #define com_artifex_mupdf_fitz_NativeDevice_BLEND_COLOR 14L
 #undef com_artifex_mupdf_fitz_NativeDevice_BLEND_LUMINOSITY
 #define com_artifex_mupdf_fitz_NativeDevice_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_NativeDevice_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_NativeDevice_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_NativeDevice_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_NativeDevice_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_NativeDevice_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_NativeDevice_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_NativeDevice_IGNORE_SHADE 2L
 /*
  * Class:     com_artifex_mupdf_fitz_NativeDevice
  * Method:    finalize
@@ -1308,10 +1180,10 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_endMask
 /*
  * Class:     com_artifex_mupdf_fitz_NativeDevice
  * Method:    beginGroup
- * Signature: (Lcom/artifex/mupdf/fitz/Rect;ZZIF)V
+ * Signature: (Lcom/artifex/mupdf/fitz/Rect;Lcom/artifex/mupdf/fitz/ColorSpace;ZZIF)V
  */
 JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_NativeDevice_beginGroup
-  (JNIEnv *, jobject, jobject, jboolean, jboolean, jint, jfloat);
+  (JNIEnv *, jobject, jobject, jobject, jboolean, jboolean, jint, jfloat);
 
 /*
  * Class:     com_artifex_mupdf_fitz_NativeDevice
@@ -3092,22 +2964,22 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Shade_finalize
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_StrokeState_LINECAP_BUTT
-#define com_artifex_mupdf_fitz_StrokeState_LINECAP_BUTT 0L
-#undef com_artifex_mupdf_fitz_StrokeState_LINECAP_ROUND
-#define com_artifex_mupdf_fitz_StrokeState_LINECAP_ROUND 1L
-#undef com_artifex_mupdf_fitz_StrokeState_LINECAP_SQUARE
-#define com_artifex_mupdf_fitz_StrokeState_LINECAP_SQUARE 2L
-#undef com_artifex_mupdf_fitz_StrokeState_LINECAP_TRIANGLE
-#define com_artifex_mupdf_fitz_StrokeState_LINECAP_TRIANGLE 3L
-#undef com_artifex_mupdf_fitz_StrokeState_LINEJOIN_MITER
-#define com_artifex_mupdf_fitz_StrokeState_LINEJOIN_MITER 0L
-#undef com_artifex_mupdf_fitz_StrokeState_LINEJOIN_ROUND
-#define com_artifex_mupdf_fitz_StrokeState_LINEJOIN_ROUND 1L
-#undef com_artifex_mupdf_fitz_StrokeState_LINEJOIN_BEVEL
-#define com_artifex_mupdf_fitz_StrokeState_LINEJOIN_BEVEL 2L
-#undef com_artifex_mupdf_fitz_StrokeState_LINEJOIN_MITER_XPS
-#define com_artifex_mupdf_fitz_StrokeState_LINEJOIN_MITER_XPS 3L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_CAP_BUTT
+#define com_artifex_mupdf_fitz_StrokeState_LINE_CAP_BUTT 0L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_CAP_ROUND
+#define com_artifex_mupdf_fitz_StrokeState_LINE_CAP_ROUND 1L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_CAP_SQUARE
+#define com_artifex_mupdf_fitz_StrokeState_LINE_CAP_SQUARE 2L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_CAP_TRIANGLE
+#define com_artifex_mupdf_fitz_StrokeState_LINE_CAP_TRIANGLE 3L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_MITER
+#define com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_MITER 0L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_ROUND
+#define com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_ROUND 1L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_BEVEL
+#define com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_BEVEL 2L
+#undef com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_MITER_XPS
+#define com_artifex_mupdf_fitz_StrokeState_LINE_JOIN_MITER_XPS 3L
 /*
  * Class:     com_artifex_mupdf_fitz_StrokeState
  * Method:    finalize