diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo')
7 files changed, 35 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c index dc39bccf20..9733cccad0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo.c @@ -875,6 +875,26 @@ JNIEXPORT jboolean JNICALL Cairo_NATIVE(_1cairo_1region_1contains_1point) } #endif +#ifndef NO__1cairo_1region_1copy +JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1region_1copy) + (JNIEnv *env, jclass that, jintLong arg0) +{ + jintLong rc = 0; + Cairo_NATIVE_ENTER(env, that, _1cairo_1region_1copy_FUNC); +/* + rc = (jintLong)cairo_region_copy(arg0); +*/ + { + Cairo_LOAD_FUNCTION(fp, cairo_region_copy) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + } + } + Cairo_NATIVE_EXIT(env, that, _1cairo_1region_1copy_FUNC); + return rc; +} +#endif + #ifndef NO__1cairo_1region_1get_1rectangle JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1region_1get_1rectangle) (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h index 2554ab6068..fecaef595a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h @@ -32,6 +32,7 @@ #define cairo_ps_surface_set_size_LIB LIB_CAIRO #define cairo_region_num_rectangles_LIB LIB_CAIRO #define cairo_region_contains_point_LIB LIB_CAIRO +#define cairo_region_copy_LIB LIB_CAIRO #define cairo_region_get_rectangle_LIB LIB_CAIRO #define cairo_surface_set_device_scale_LIB LIB_CAIRO #define cairo_surface_get_device_scale_LIB LIB_CAIRO diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c index 68d31d2c6a..4153701dea 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.c @@ -97,6 +97,7 @@ char * Cairo_nativeFunctionNames[] = { "_1cairo_1rectangle", "_1cairo_1reference", "_1cairo_1region_1contains_1point", + "_1cairo_1region_1copy", "_1cairo_1region_1get_1rectangle", "_1cairo_1region_1num_1rectangles", "_1cairo_1reset_1clip", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h index 13f3005169..1eae730340 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_stats.h @@ -107,6 +107,7 @@ typedef enum { _1cairo_1rectangle_FUNC, _1cairo_1reference_FUNC, _1cairo_1region_1contains_1point_FUNC, + _1cairo_1region_1copy_FUNC, _1cairo_1region_1get_1rectangle_FUNC, _1cairo_1region_1num_1rectangles_FUNC, _1cairo_1reset_1clip_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c index a54a37e80d..6f5afd45c9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.c @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2016 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2018 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h index 6ffd32cb80..5faf6e80d8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_structs.h @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2016 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2018 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java index 27918325ef..2af4e020fa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java @@ -1276,6 +1276,16 @@ public static final int cairo_region_num_rectangles(long /*int*/ region) { } } /** @method flags=dynamic */ +public static final native long /*int*/ _cairo_region_copy(long /*int*/ region); +public static final long /*int*/ cairo_region_copy(long /*int*/ region) { + lock.lock(); + try { + return _cairo_region_copy(region); + } finally { + lock.unlock(); + } +} +/** @method flags=dynamic */ public static final native boolean _cairo_region_contains_point(long /*int*/ region, int x, int y); public static final boolean cairo_region_contains_point(long /*int*/ region, int x, int y) { lock.lock(); |