diff options
5 files changed, 41 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cairo.Cairo.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cairo.Cairo.properties index 27d9e328c8..072472128d 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cairo.Cairo.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.cairo.Cairo.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2006 IBM Corporation and others. +# Copyright (c) 2000, 2007 IBM Corporation and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -9,6 +9,11 @@ # IBM Corporation - initial API and implementation ############################################################################### org_eclipse_swt_internal_cairo_Cairo= +Cairo_CAIRO_VERSION_ENCODE= +Cairo_CAIRO_VERSION_ENCODE_0= +Cairo_CAIRO_VERSION_ENCODE_1= +Cairo_CAIRO_VERSION_ENCODE_2= + Cairo_cairo_append_path= Cairo_cairo_append_path_0=cast=(cairo_t *) Cairo_cairo_append_path_1=cast=(cairo_path_t *) @@ -593,6 +598,8 @@ Cairo_cairo_user_to_device_distance_0=cast=(cairo_t *) Cairo_cairo_user_to_device_distance_1= Cairo_cairo_user_to_device_distance_2= +Cairo_cairo_version= + Cairo_cairo_xlib_surface_create= Cairo_cairo_xlib_surface_create_0=cast=(Display *) Cairo_cairo_xlib_surface_create_1=cast=(Drawable) 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 74e03e4d00..408ccc3b26 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 @@ -25,6 +25,18 @@ #define Cairo_NATIVE(func) Java_org_eclipse_swt_internal_cairo_Cairo_##func +#ifndef NO_CAIRO_1VERSION_1ENCODE +JNIEXPORT jint JNICALL Cairo_NATIVE(CAIRO_1VERSION_1ENCODE) + (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2) +{ + jint rc = 0; + Cairo_NATIVE_ENTER(env, that, CAIRO_1VERSION_1ENCODE_FUNC); + rc = (jint)CAIRO_VERSION_ENCODE(arg0, arg1, arg2); + Cairo_NATIVE_EXIT(env, that, CAIRO_1VERSION_1ENCODE_FUNC); + return rc; +} +#endif + #ifndef NO_cairo_1append_1path JNIEXPORT void JNICALL Cairo_NATIVE(cairo_1append_1path) (JNIEnv *env, jclass that, jint arg0, jint arg1) @@ -1720,6 +1732,18 @@ fail: } #endif +#ifndef NO_cairo_1version +JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1version) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + Cairo_NATIVE_ENTER(env, that, cairo_1version_FUNC); + rc = (jint)cairo_version(); + Cairo_NATIVE_EXIT(env, that, cairo_1version_FUNC); + return rc; +} +#endif + #ifndef NO_cairo_1xlib_1surface_1create JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1xlib_1surface_1create) (JNIEnv *env, jclass that, jint arg0, jint arg1, jint arg2, jint arg3, jint arg4) 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 852f4e7a3c..cfe055586f 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 @@ -24,9 +24,10 @@ #ifdef NATIVE_STATS -int Cairo_nativeFunctionCount = 143; -int Cairo_nativeFunctionCallCount[143]; +int Cairo_nativeFunctionCount = 145; +int Cairo_nativeFunctionCallCount[145]; char * Cairo_nativeFunctionNames[] = { + "CAIRO_1VERSION_1ENCODE", "cairo_1append_1path", "cairo_1arc", "cairo_1arc_1negative", @@ -164,6 +165,7 @@ char * Cairo_nativeFunctionNames[] = { "cairo_1translate", "cairo_1user_1to_1device", "cairo_1user_1to_1device_1distance", + "cairo_1version", "cairo_1xlib_1surface_1create", "cairo_1xlib_1surface_1create_1for_1bitmap", "cairo_1xlib_1surface_1set_1size", 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 957ea984f8..3b401efd36 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 @@ -35,6 +35,7 @@ extern char* Cairo_nativeFunctionNames[]; #endif typedef enum { + CAIRO_1VERSION_1ENCODE_FUNC, cairo_1append_1path_FUNC, cairo_1arc_FUNC, cairo_1arc_1negative_FUNC, @@ -172,6 +173,7 @@ typedef enum { cairo_1translate_FUNC, cairo_1user_1to_1device_FUNC, cairo_1user_1to_1device_1distance_FUNC, + cairo_1version_FUNC, cairo_1xlib_1surface_1create_FUNC, cairo_1xlib_1surface_1create_1for_1bitmap_FUNC, cairo_1xlib_1surface_1set_1size_FUNC, 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 279587f7a1..b630487540 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 @@ -91,6 +91,7 @@ public class Cairo { public static final int CAIRO_EXTEND_NONE = 0; public static final int CAIRO_EXTEND_REPEAT = 1; public static final int CAIRO_EXTEND_REFLECT = 2; + public static final int CAIRO_EXTEND_PAD = 3; public static final int CAIRO_PATH_MOVE_TO = 0; public static final int CAIRO_PATH_LINE_TO = 1; public static final int CAIRO_PATH_CURVE_TO = 2; @@ -103,6 +104,8 @@ public static final synchronized native int cairo_path_t_sizeof (); public static final synchronized native int cairo_text_extents_t_sizeof (); /** Natives */ +public static final synchronized native int CAIRO_VERSION_ENCODE(int major, int minor, int micro); +public static final synchronized native int cairo_version(); public static final synchronized native int /*long*/ cairo_create (int /*long*/ target); public static final synchronized native int /*long*/ cairo_reference (int /*long*/ cr); public static final synchronized native void cairo_destroy (int /*long*/ cr); |