From ca8f110730ad5aadbc80a450a46de62c4004cbd1 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 22 Sep 2016 14:01:31 +0200 Subject: 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. --- platform/android/viewer/jni/mupdf.c | 8 +- platform/ios/Classes/MuDocumentController.m | 6 +- platform/ios/Classes/MuPageViewNormal.m | 10 +- platform/java/mupdf_native.h | 544 ++++++++++----------- .../java/src/com/artifex/mupdf/fitz/Device.java | 64 +-- .../src/com/artifex/mupdf/fitz/StrokeState.java | 18 +- 6 files changed, 325 insertions(+), 325 deletions(-) (limited to 'platform') diff --git a/platform/android/viewer/jni/mupdf.c b/platform/android/viewer/jni/mupdf.c index 4f3b31f7..b682296c 100644 --- a/platform/android/viewer/jni/mupdf.c +++ b/platform/android/viewer/jni/mupdf.c @@ -1546,7 +1546,7 @@ JNI_FN(MuPDFCore_addMarkupAnnotationInternal)(JNIEnv * env, jobject thiz, jobjec switch (type) { - case FZ_ANNOT_HIGHLIGHT: + case PDF_ANNOT_HIGHLIGHT: color[0] = 1.0; color[1] = 1.0; color[2] = 0.0; @@ -1554,7 +1554,7 @@ JNI_FN(MuPDFCore_addMarkupAnnotationInternal)(JNIEnv * env, jobject thiz, jobjec line_thickness = 1.0; line_height = 0.5; break; - case FZ_ANNOT_UNDERLINE: + case PDF_ANNOT_UNDERLINE: color[0] = 0.0; color[1] = 0.0; color[2] = 1.0; @@ -1562,7 +1562,7 @@ JNI_FN(MuPDFCore_addMarkupAnnotationInternal)(JNIEnv * env, jobject thiz, jobjec line_thickness = LINE_THICKNESS; line_height = UNDERLINE_HEIGHT; break; - case FZ_ANNOT_STRIKEOUT: + case PDF_ANNOT_STRIKE_OUT: color[0] = 1.0; color[1] = 0.0; color[2] = 0.0; @@ -1697,7 +1697,7 @@ JNI_FN(MuPDFCore_addInkAnnotationInternal)(JNIEnv * env, jobject thiz, jobjectAr (*env)->DeleteLocalRef(env, arc); } - annot = (fz_annot *)pdf_create_annot(ctx, idoc, (pdf_page *)pc->page, FZ_ANNOT_INK); + annot = (fz_annot *)pdf_create_annot(ctx, idoc, (pdf_page *)pc->page, PDF_ANNOT_INK); pdf_set_ink_annot_list(ctx, idoc, (pdf_annot *)annot, pts, counts, n, color, INK_THICKNESS); diff --git a/platform/ios/Classes/MuDocumentController.m b/platform/ios/Classes/MuDocumentController.m index a06e5912..02efe1ee 100644 --- a/platform/ios/Classes/MuDocumentController.m +++ b/platform/ios/Classes/MuDocumentController.m @@ -695,15 +695,15 @@ static void saveDoc(const char *current_path, fz_document *doc) switch (barmode) { case BARMODE_HIGHLIGHT: - [view saveSelectionAsMarkup:FZ_ANNOT_HIGHLIGHT]; + [view saveSelectionAsMarkup:PDF_ANNOT_HIGHLIGHT]; break; case BARMODE_UNDERLINE: - [view saveSelectionAsMarkup:FZ_ANNOT_UNDERLINE]; + [view saveSelectionAsMarkup:PDF_ANNOT_UNDERLINE]; break; case BARMODE_STRIKE: - [view saveSelectionAsMarkup:FZ_ANNOT_STRIKEOUT]; + [view saveSelectionAsMarkup:PDF_ANNOT_STRIKEOUT]; break; case BARMODE_INK: diff --git a/platform/ios/Classes/MuPageViewNormal.m b/platform/ios/Classes/MuPageViewNormal.m index fb88d8de..496b62ce 100644 --- a/platform/ios/Classes/MuPageViewNormal.m +++ b/platform/ios/Classes/MuPageViewNormal.m @@ -168,7 +168,7 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r switch (type) { - case FZ_ANNOT_HIGHLIGHT: + case PDF_ANNOT_HIGHLIGHT: color[0] = 1.0; color[1] = 1.0; color[2] = 0.0; @@ -176,7 +176,7 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r line_thickness = 1.0; line_height = 0.5; break; - case FZ_ANNOT_UNDERLINE: + case PDF_ANNOT_UNDERLINE: color[0] = 0.0; color[1] = 0.0; color[2] = 1.0; @@ -184,7 +184,7 @@ static void addMarkupAnnot(fz_document *doc, fz_page *page, int type, NSArray *r line_thickness = LINE_THICKNESS; line_height = UNDERLINE_HEIGHT; break; - case FZ_ANNOT_STRIKEOUT: + case PDF_ANNOT_STRIKEOUT: color[0] = 1.0; color[1] = 0.0; color[2] = 0.0; @@ -283,7 +283,7 @@ static void addInkAnnot(fz_document *doc, fz_page *page, NSArray *curves) } } - annot = pdf_create_annot(ctx, idoc, (pdf_page *)page, FZ_ANNOT_INK); + annot = pdf_create_annot(ctx, idoc, (pdf_page *)page, PDF_ANNOT_INK); pdf_set_ink_annot_list(ctx, idoc, annot, pts, counts, n, color, INK_THICKNESS); } fz_always(ctx) @@ -1360,7 +1360,7 @@ static void updatePixmap(fz_document *doc, fz_display_list *page_list, fz_displa for (i = 0; i < annotations.count; i++) { MuAnnotation *annot = annotations[i]; - if (annot.type != FZ_ANNOT_WIDGET && CGRectContainsPoint(annot.rect, ipt)) + if (annot.type != PDF_ANNOT_WIDGET && CGRectContainsPoint(annot.rect, ipt)) { [self selectAnnotation:i]; return [[[MuTapResultAnnotation alloc] initWithAnnotation:annot] autorelease]; 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 diff --git a/platform/java/src/com/artifex/mupdf/fitz/Device.java b/platform/java/src/com/artifex/mupdf/fitz/Device.java index 295226fe..bbb5ae3b 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/Device.java +++ b/platform/java/src/com/artifex/mupdf/fitz/Device.java @@ -61,44 +61,44 @@ public class Device public void endTile() {} /* Flags */ - public static final int FZ_DEVFLAG_MASK = 1; - public static final int FZ_DEVFLAG_COLOR = 2; - public static final int FZ_DEVFLAG_UNCACHEABLE = 4; - public static final int FZ_DEVFLAG_FILLCOLOR_UNDEFINED = 8; - public static final int FZ_DEVFLAG_STROKECOLOR_UNDEFINED = 16; - public static final int FZ_DEVFLAG_STARTCAP_UNDEFINED = 32; - public static final int FZ_DEVFLAG_DASHCAP_UNDEFINED = 64; - public static final int FZ_DEVFLAG_ENDCAP_UNDEFINED = 128; - public static final int FZ_DEVFLAG_LINEJOIN_UNDEFINED = 256; - public static final int FZ_DEVFLAG_MITERLIMIT_UNDEFINED = 512; - public static final int FZ_DEVFLAG_LINEWIDTH_UNDEFINED = 1024; + public static final int FLAG_MASK = 1; + public static final int FLAG_COLOR = 2; + public static final int FLAG_UNCACHEABLE = 4; + public static final int FLAG_FILLCOLOR_UNDEFINED = 8; + public static final int FLAG_STROKECOLOR_UNDEFINED = 16; + public static final int FLAG_STARTCAP_UNDEFINED = 32; + public static final int FLAG_DASHCAP_UNDEFINED = 64; + public static final int FLAG_ENDCAP_UNDEFINED = 128; + public static final int FLAG_LINEJOIN_UNDEFINED = 256; + public static final int FLAG_MITERLIMIT_UNDEFINED = 512; + public static final int FLAG_LINEWIDTH_UNDEFINED = 1024; /* PDF 1.4 -- standard separable */ - public static final int FZ_BLEND_NORMAL = 0; - public static final int FZ_BLEND_MULTIPLY = 1; - public static final int FZ_BLEND_SCREEN = 2; - public static final int FZ_BLEND_OVERLAY = 3; - public static final int FZ_BLEND_DARKEN = 4; - public static final int FZ_BLEND_LIGHTEN = 5; - public static final int FZ_BLEND_COLOR_DODGE = 6; - public static final int FZ_BLEND_COLOR_BURN = 7; - public static final int FZ_BLEND_HARD_LIGHT = 8; - public static final int FZ_BLEND_SOFT_LIGHT = 9; - public static final int FZ_BLEND_DIFFERENCE = 10; - public static final int FZ_BLEND_EXCLUSION = 11; + public static final int BLEND_NORMAL = 0; + public static final int BLEND_MULTIPLY = 1; + public static final int BLEND_SCREEN = 2; + public static final int BLEND_OVERLAY = 3; + public static final int BLEND_DARKEN = 4; + public static final int BLEND_LIGHTEN = 5; + public static final int BLEND_COLOR_DODGE = 6; + public static final int BLEND_COLOR_BURN = 7; + public static final int BLEND_HARD_LIGHT = 8; + public static final int BLEND_SOFT_LIGHT = 9; + public static final int BLEND_DIFFERENCE = 10; + public static final int BLEND_EXCLUSION = 11; /* PDF 1.4 -- standard non-separable */ - public static final int FZ_BLEND_HUE = 12; - public static final int FZ_BLEND_SATURATION = 13; - public static final int FZ_BLEND_COLOR = 14; - public static final int FZ_BLEND_LUMINOSITY = 15; + public static final int BLEND_HUE = 12; + public static final int BLEND_SATURATION = 13; + public static final int BLEND_COLOR = 14; + public static final int BLEND_LUMINOSITY = 15; /* For packing purposes */ - public static final int FZ_BLEND_MODEMASK = 15; - public static final int FZ_BLEND_ISOLATED = 16; - public static final int FZ_BLEND_KNOCKOUT = 32; + public static final int BLEND_MODEMASK = 15; + public static final int BLEND_ISOLATED = 16; + public static final int BLEND_KNOCKOUT = 32; /* Device hints */ - public static final int FZ_IGNORE_IMAGE = 1; - public static final int FZ_IGNORE_SHADE = 2; + public static final int IGNORE_IMAGE = 1; + public static final int IGNORE_SHADE = 2; } diff --git a/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java index 7f333f76..c29291fc 100644 --- a/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java +++ b/platform/java/src/com/artifex/mupdf/fitz/StrokeState.java @@ -2,15 +2,15 @@ package com.artifex.mupdf.fitz; public class StrokeState { - public static final int FZ_LINECAP_BUTT = 0; - public static final int FZ_LINECAP_ROUND = 1; - public static final int FZ_LINECAP_SQUARE = 2; - public static final int FZ_LINECAP_TRIANGLE = 3; - - public static final int FZ_LINEJOIN_MITER = 0; - public static final int FZ_LINEJOIN_ROUND = 1; - public static final int FZ_LINEJOIN_BEVEL = 2; - public static final int FZ_LINEJOIN_MITER_XPS = 3; + public static final int LINECAP_BUTT = 0; + public static final int LINECAP_ROUND = 1; + public static final int LINECAP_SQUARE = 2; + public static final int LINECAP_TRIANGLE = 3; + + public static final int LINEJOIN_MITER = 0; + public static final int LINEJOIN_ROUND = 1; + public static final int LINEJOIN_BEVEL = 2; + public static final int LINEJOIN_MITER_XPS = 3; private long pointer; -- cgit v1.2.3