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.

1 files changed, 272 insertions, 272 deletions

diff --git a/platform/java/mupdf_native.h b/platform/java/mupdf_native.h
index 6807d27c..1a7a018c 100644
--- a/platform/java/mupdf_native.h
+++ b/platform/java/mupdf_native.h
@@ -336,70 +336,70 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Cookie_abort
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_MASK
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_COLOR
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_Device_FZ_DEVFLAG_LINEWIDTH_UNDEFINED 1024L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_NORMAL
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_NORMAL 0L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_MULTIPLY
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_MULTIPLY 1L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_SCREEN
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_SCREEN 2L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_OVERLAY
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_OVERLAY 3L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_DARKEN
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_DARKEN 4L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_LIGHTEN
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_LIGHTEN 5L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_COLOR_DODGE
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_COLOR_DODGE 6L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_COLOR_BURN
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_COLOR_BURN 7L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_HARD_LIGHT
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_HARD_LIGHT 8L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_SOFT_LIGHT
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_SOFT_LIGHT 9L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_DIFFERENCE
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_DIFFERENCE 10L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_EXCLUSION
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_EXCLUSION 11L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_HUE
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_HUE 12L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_SATURATION
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_SATURATION 13L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_COLOR
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_COLOR 14L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_LUMINOSITY
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_Device_FZ_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_Device_FZ_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_Device_FZ_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_Device_FZ_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_Device_FZ_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_Device_FZ_IGNORE_SHADE 2L
+#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
+#define com_artifex_mupdf_fitz_Device_BLEND_MULTIPLY 1L
+#undef com_artifex_mupdf_fitz_Device_BLEND_SCREEN
+#define com_artifex_mupdf_fitz_Device_BLEND_SCREEN 2L
+#undef com_artifex_mupdf_fitz_Device_BLEND_OVERLAY
+#define com_artifex_mupdf_fitz_Device_BLEND_OVERLAY 3L
+#undef com_artifex_mupdf_fitz_Device_BLEND_DARKEN
+#define com_artifex_mupdf_fitz_Device_BLEND_DARKEN 4L
+#undef com_artifex_mupdf_fitz_Device_BLEND_LIGHTEN
+#define com_artifex_mupdf_fitz_Device_BLEND_LIGHTEN 5L
+#undef com_artifex_mupdf_fitz_Device_BLEND_COLOR_DODGE
+#define com_artifex_mupdf_fitz_Device_BLEND_COLOR_DODGE 6L
+#undef com_artifex_mupdf_fitz_Device_BLEND_COLOR_BURN
+#define com_artifex_mupdf_fitz_Device_BLEND_COLOR_BURN 7L
+#undef com_artifex_mupdf_fitz_Device_BLEND_HARD_LIGHT
+#define com_artifex_mupdf_fitz_Device_BLEND_HARD_LIGHT 8L
+#undef com_artifex_mupdf_fitz_Device_BLEND_SOFT_LIGHT
+#define com_artifex_mupdf_fitz_Device_BLEND_SOFT_LIGHT 9L
+#undef com_artifex_mupdf_fitz_Device_BLEND_DIFFERENCE
+#define com_artifex_mupdf_fitz_Device_BLEND_DIFFERENCE 10L
+#undef com_artifex_mupdf_fitz_Device_BLEND_EXCLUSION
+#define com_artifex_mupdf_fitz_Device_BLEND_EXCLUSION 11L
+#undef com_artifex_mupdf_fitz_Device_BLEND_HUE
+#define com_artifex_mupdf_fitz_Device_BLEND_HUE 12L
+#undef com_artifex_mupdf_fitz_Device_BLEND_SATURATION
+#define com_artifex_mupdf_fitz_Device_BLEND_SATURATION 13L
+#undef com_artifex_mupdf_fitz_Device_BLEND_COLOR
+#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
@@ -510,70 +510,70 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_DisplayList_run
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_MASK
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_COLOR
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_DEVFLAG_LINEWIDTH_UNDEFINED 1024L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_NORMAL
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_NORMAL 0L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_MULTIPLY
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_MULTIPLY 1L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_SCREEN
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_SCREEN 2L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_OVERLAY
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_OVERLAY 3L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_DARKEN
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_DARKEN 4L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_LIGHTEN
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_LIGHTEN 5L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_COLOR_DODGE
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_COLOR_DODGE 6L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_COLOR_BURN
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_COLOR_BURN 7L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_HARD_LIGHT
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_HARD_LIGHT 8L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_SOFT_LIGHT
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_SOFT_LIGHT 9L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_DIFFERENCE
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_DIFFERENCE 10L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_EXCLUSION
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_EXCLUSION 11L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_HUE
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_HUE 12L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_SATURATION
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_SATURATION 13L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_COLOR
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_COLOR 14L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_LUMINOSITY
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_DisplayListDevice_FZ_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_DisplayListDevice_FZ_IGNORE_SHADE 2L
+#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
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_MULTIPLY 1L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_SCREEN
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_SCREEN 2L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_OVERLAY
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_OVERLAY 3L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_DARKEN
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_DARKEN 4L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_LIGHTEN
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_LIGHTEN 5L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_COLOR_DODGE
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_COLOR_DODGE 6L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_COLOR_BURN
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_COLOR_BURN 7L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_HARD_LIGHT
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_HARD_LIGHT 8L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_SOFT_LIGHT
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_SOFT_LIGHT 9L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_DIFFERENCE
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_DIFFERENCE 10L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_EXCLUSION
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_EXCLUSION 11L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_HUE
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_HUE 12L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_SATURATION
+#define com_artifex_mupdf_fitz_DisplayListDevice_BLEND_SATURATION 13L
+#undef com_artifex_mupdf_fitz_DisplayListDevice_BLEND_COLOR
+#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
@@ -767,70 +767,70 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_DocumentWriter_close
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_MASK
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_COLOR
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_DEVFLAG_LINEWIDTH_UNDEFINED 1024L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_NORMAL
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_NORMAL 0L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_MULTIPLY
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_MULTIPLY 1L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_SCREEN
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_SCREEN 2L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_OVERLAY
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_OVERLAY 3L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_DARKEN
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_DARKEN 4L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_LIGHTEN
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_LIGHTEN 5L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_COLOR_DODGE
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_COLOR_DODGE 6L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_COLOR_BURN
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_COLOR_BURN 7L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_HARD_LIGHT
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_HARD_LIGHT 8L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_SOFT_LIGHT
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_SOFT_LIGHT 9L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_DIFFERENCE
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_DIFFERENCE 10L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_EXCLUSION
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_EXCLUSION 11L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_HUE
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_HUE 12L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_SATURATION
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_SATURATION 13L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_COLOR
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_COLOR 14L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_LUMINOSITY
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_DrawDevice_FZ_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_DrawDevice_FZ_IGNORE_SHADE 2L
+#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
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_MULTIPLY 1L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_SCREEN
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_SCREEN 2L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_OVERLAY
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_OVERLAY 3L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_DARKEN
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_DARKEN 4L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_LIGHTEN
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_LIGHTEN 5L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_COLOR_DODGE
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_COLOR_DODGE 6L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_COLOR_BURN
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_COLOR_BURN 7L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_HARD_LIGHT
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_HARD_LIGHT 8L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_SOFT_LIGHT
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_SOFT_LIGHT 9L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_DIFFERENCE
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_DIFFERENCE 10L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_EXCLUSION
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_EXCLUSION 11L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_HUE
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_HUE 12L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_SATURATION
+#define com_artifex_mupdf_fitz_DrawDevice_BLEND_SATURATION 13L
+#undef com_artifex_mupdf_fitz_DrawDevice_BLEND_COLOR
+#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
@@ -1046,70 +1046,70 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_MASK
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_MASK 1L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_COLOR
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_COLOR 2L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_UNCACHEABLE
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_UNCACHEABLE 4L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_FILLCOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_FILLCOLOR_UNDEFINED 8L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_STROKECOLOR_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_STROKECOLOR_UNDEFINED 16L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_STARTCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_STARTCAP_UNDEFINED 32L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_DASHCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_DASHCAP_UNDEFINED 64L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_ENDCAP_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_ENDCAP_UNDEFINED 128L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_LINEJOIN_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_LINEJOIN_UNDEFINED 256L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_MITERLIMIT_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_MITERLIMIT_UNDEFINED 512L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_LINEWIDTH_UNDEFINED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_DEVFLAG_LINEWIDTH_UNDEFINED 1024L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_NORMAL
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_NORMAL 0L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_MULTIPLY
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_MULTIPLY 1L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_SCREEN
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_SCREEN 2L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_OVERLAY
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_OVERLAY 3L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_DARKEN
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_DARKEN 4L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_LIGHTEN
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_LIGHTEN 5L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_COLOR_DODGE
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_COLOR_DODGE 6L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_COLOR_BURN
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_COLOR_BURN 7L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_HARD_LIGHT
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_HARD_LIGHT 8L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_SOFT_LIGHT
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_SOFT_LIGHT 9L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_DIFFERENCE
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_DIFFERENCE 10L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_EXCLUSION
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_EXCLUSION 11L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_HUE
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_HUE 12L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_SATURATION
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_SATURATION 13L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_COLOR
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_COLOR 14L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_LUMINOSITY
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_LUMINOSITY 15L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_MODEMASK
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_MODEMASK 15L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_ISOLATED
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_ISOLATED 16L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_KNOCKOUT
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_BLEND_KNOCKOUT 32L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_IGNORE_IMAGE
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_IGNORE_IMAGE 1L
-#undef com_artifex_mupdf_fitz_NativeDevice_FZ_IGNORE_SHADE
-#define com_artifex_mupdf_fitz_NativeDevice_FZ_IGNORE_SHADE 2L
+#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
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_MULTIPLY 1L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_SCREEN
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_SCREEN 2L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_OVERLAY
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_OVERLAY 3L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_DARKEN
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_DARKEN 4L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_LIGHTEN
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_LIGHTEN 5L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_COLOR_DODGE
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_COLOR_DODGE 6L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_COLOR_BURN
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_COLOR_BURN 7L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_HARD_LIGHT
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_HARD_LIGHT 8L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_SOFT_LIGHT
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_SOFT_LIGHT 9L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_DIFFERENCE
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_DIFFERENCE 10L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_EXCLUSION
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_EXCLUSION 11L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_HUE
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_HUE 12L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_SATURATION
+#define com_artifex_mupdf_fitz_NativeDevice_BLEND_SATURATION 13L
+#undef com_artifex_mupdf_fitz_NativeDevice_BLEND_COLOR
+#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
@@ -2496,22 +2496,22 @@ JNIEXPORT void JNICALL Java_com_artifex_mupdf_fitz_Shade_finalize
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_BUTT
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_BUTT 0L
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_ROUND
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_ROUND 1L
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_SQUARE
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_SQUARE 2L
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_TRIANGLE
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINECAP_TRIANGLE 3L
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_MITER
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_MITER 0L
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_ROUND
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_ROUND 1L
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_BEVEL
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_BEVEL 2L
-#undef com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_MITER_XPS
-#define com_artifex_mupdf_fitz_StrokeState_FZ_LINEJOIN_MITER_XPS 3L
+#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
 /*
  * Class:     com_artifex_mupdf_fitz_StrokeState
  * Method:    finalize