diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library')
5 files changed, 5 insertions, 225 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 8c2052bcaa..ee6c4b2772 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 @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2012 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2013 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -242,20 +242,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1fill_1preserve) } #endif -#ifndef NO__1cairo_1font_1extents -JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1font_1extents) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) -{ - cairo_font_extents_t _arg1, *lparg1=NULL; - Cairo_NATIVE_ENTER(env, that, _1cairo_1font_1extents_FUNC); - if (arg1) if ((lparg1 = getcairo_font_extents_tFields(env, arg1, &_arg1)) == NULL) goto fail; - cairo_font_extents((cairo_t *)arg0, lparg1); -fail: - if (arg1 && lparg1) setcairo_font_extents_tFields(env, arg1, lparg1); - Cairo_NATIVE_EXIT(env, that, _1cairo_1font_1extents_FUNC); -} -#endif - #ifndef NO__1cairo_1font_1options_1create JNIEXPORT jintLong JNICALL Cairo_NATIVE(_1cairo_1font_1options_1create) (JNIEnv *env, jclass that) @@ -387,16 +373,6 @@ fail: } #endif -#ifndef NO__1cairo_1get_1font_1options -JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1get_1font_1options) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) -{ - Cairo_NATIVE_ENTER(env, that, _1cairo_1get_1font_1options_FUNC); - cairo_get_font_options((cairo_t *)arg0, (cairo_font_options_t *)arg1); - Cairo_NATIVE_EXIT(env, that, _1cairo_1get_1font_1options_FUNC); -} -#endif - #ifndef NO__1cairo_1get_1line_1cap JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1get_1line_1cap) (JNIEnv *env, jclass that, jintLong arg0) @@ -1523,20 +1499,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1page) } #endif -#ifndef NO__1cairo_1show_1text -JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1show_1text) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -{ - jbyte *lparg1=NULL; - Cairo_NATIVE_ENTER(env, that, _1cairo_1show_1text_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - cairo_show_text((cairo_t *)arg0, (const char *)lparg1); -fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - Cairo_NATIVE_EXIT(env, that, _1cairo_1show_1text_FUNC); -} -#endif - #ifndef NO__1cairo_1status JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1status) (JNIEnv *env, jclass that, jintLong arg0) @@ -1758,37 +1720,6 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1surface_1set_1user_1data) } #endif -#ifndef NO__1cairo_1text_1extents -JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1extents) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jobject arg2) -{ - jbyte *lparg1=NULL; - cairo_text_extents_t _arg2, *lparg2=NULL; - Cairo_NATIVE_ENTER(env, that, _1cairo_1text_1extents_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - if (arg2) if ((lparg2 = getcairo_text_extents_tFields(env, arg2, &_arg2)) == NULL) goto fail; - cairo_text_extents((cairo_t *)arg0, (const char *)lparg1, (cairo_text_extents_t *)lparg2); -fail: - if (arg2 && lparg2) setcairo_text_extents_tFields(env, arg2, lparg2); - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - Cairo_NATIVE_EXIT(env, that, _1cairo_1text_1extents_FUNC); -} -#endif - -#ifndef NO__1cairo_1text_1path -JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1text_1path) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) -{ - jbyte *lparg1=NULL; - Cairo_NATIVE_ENTER(env, that, _1cairo_1text_1path_FUNC); - if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; - cairo_text_path((cairo_t *)arg0, (const char *)lparg1); -fail: - if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); - Cairo_NATIVE_EXIT(env, that, _1cairo_1text_1path_FUNC); -} -#endif - #ifndef NO__1cairo_1transform JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1transform) (JNIEnv *env, jclass that, jintLong arg0, jdoubleArray arg1) @@ -1941,18 +1872,6 @@ JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1xlib_1surface_1set_1size) } #endif -#ifndef NO_cairo_1font_1extents_1t_1sizeof -JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1font_1extents_1t_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1font_1extents_1t_1sizeof_FUNC); - rc = (jint)cairo_font_extents_t_sizeof(); - Cairo_NATIVE_EXIT(env, that, cairo_1font_1extents_1t_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_cairo_1path_1data_1t_1sizeof JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1path_1data_1t_1sizeof) (JNIEnv *env, jclass that) @@ -1977,18 +1896,6 @@ JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1path_1t_1sizeof) } #endif -#ifndef NO_cairo_1text_1extents_1t_1sizeof -JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1text_1extents_1t_1sizeof) - (JNIEnv *env, jclass that) -{ - jint rc = 0; - Cairo_NATIVE_ENTER(env, that, cairo_1text_1extents_1t_1sizeof_FUNC); - rc = (jint)cairo_text_extents_t_sizeof(); - Cairo_NATIVE_EXIT(env, that, cairo_1text_1extents_1t_1sizeof_FUNC); - return rc; -} -#endif - #ifndef NO_cairo_1version JNIEXPORT jint JNICALL Cairo_NATIVE(cairo_1version) (JNIEnv *env, jclass that) 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 5cdb9a0ddf..1ed286b6f2 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 @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2012 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2013 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -43,7 +43,6 @@ char * Cairo_nativeFunctionNames[] = { "_1cairo_1fill", "_1cairo_1fill_1extents", "_1cairo_1fill_1preserve", - "_1cairo_1font_1extents", "_1cairo_1font_1options_1create", "_1cairo_1font_1options_1destroy", "_1cairo_1font_1options_1get_1antialias", @@ -54,7 +53,6 @@ char * Cairo_nativeFunctionNames[] = { "_1cairo_1get_1fill_1rule", "_1cairo_1get_1font_1face", "_1cairo_1get_1font_1matrix", - "_1cairo_1get_1font_1options", "_1cairo_1get_1line_1cap", "_1cairo_1get_1line_1join", "_1cairo_1get_1line_1width", @@ -146,7 +144,6 @@ char * Cairo_nativeFunctionNames[] = { "_1cairo_1set_1tolerance", "_1cairo_1show_1glyphs", "_1cairo_1show_1page", - "_1cairo_1show_1text", "_1cairo_1status", "_1cairo_1status_1to_1string", "_1cairo_1stroke", @@ -164,8 +161,6 @@ char * Cairo_nativeFunctionNames[] = { "_1cairo_1surface_1set_1device_1offset", "_1cairo_1surface_1set_1fallback_1resolution", "_1cairo_1surface_1set_1user_1data", - "_1cairo_1text_1extents", - "_1cairo_1text_1path", "_1cairo_1transform", "_1cairo_1translate", "_1cairo_1user_1to_1device", @@ -176,10 +171,8 @@ char * Cairo_nativeFunctionNames[] = { "_1cairo_1xlib_1surface_1get_1height", "_1cairo_1xlib_1surface_1get_1width", "_1cairo_1xlib_1surface_1set_1size", - "cairo_1font_1extents_1t_1sizeof", "cairo_1path_1data_1t_1sizeof", "cairo_1path_1t_1sizeof", - "cairo_1text_1extents_1t_1sizeof", "cairo_1version", #ifndef JNI64 "memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II", 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 79bfc95f83..bcb3f25550 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 @@ -15,7 +15,7 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2012 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2013 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -53,7 +53,6 @@ typedef enum { _1cairo_1fill_FUNC, _1cairo_1fill_1extents_FUNC, _1cairo_1fill_1preserve_FUNC, - _1cairo_1font_1extents_FUNC, _1cairo_1font_1options_1create_FUNC, _1cairo_1font_1options_1destroy_FUNC, _1cairo_1font_1options_1get_1antialias_FUNC, @@ -64,7 +63,6 @@ typedef enum { _1cairo_1get_1fill_1rule_FUNC, _1cairo_1get_1font_1face_FUNC, _1cairo_1get_1font_1matrix_FUNC, - _1cairo_1get_1font_1options_FUNC, _1cairo_1get_1line_1cap_FUNC, _1cairo_1get_1line_1join_FUNC, _1cairo_1get_1line_1width_FUNC, @@ -156,7 +154,6 @@ typedef enum { _1cairo_1set_1tolerance_FUNC, _1cairo_1show_1glyphs_FUNC, _1cairo_1show_1page_FUNC, - _1cairo_1show_1text_FUNC, _1cairo_1status_FUNC, _1cairo_1status_1to_1string_FUNC, _1cairo_1stroke_FUNC, @@ -174,8 +171,6 @@ typedef enum { _1cairo_1surface_1set_1device_1offset_FUNC, _1cairo_1surface_1set_1fallback_1resolution_FUNC, _1cairo_1surface_1set_1user_1data_FUNC, - _1cairo_1text_1extents_FUNC, - _1cairo_1text_1path_FUNC, _1cairo_1transform_FUNC, _1cairo_1translate_FUNC, _1cairo_1user_1to_1device_FUNC, @@ -186,10 +181,8 @@ typedef enum { _1cairo_1xlib_1surface_1get_1height_FUNC, _1cairo_1xlib_1surface_1get_1width_FUNC, _1cairo_1xlib_1surface_1set_1size_FUNC, - cairo_1font_1extents_1t_1sizeof_FUNC, cairo_1path_1data_1t_1sizeof_FUNC, cairo_1path_1t_1sizeof_FUNC, - cairo_1text_1extents_1t_1sizeof_FUNC, cairo_1version_FUNC, #ifndef JNI64 memmove__Lorg_eclipse_swt_internal_cairo_cairo_1path_1data_1t_2II_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 e9b4407bb8..49b7749b30 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,56 +15,13 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2012 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2013 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ #include "swt.h" #include "cairo_structs.h" -#ifndef NO_cairo_font_extents_t -typedef struct cairo_font_extents_t_FID_CACHE { - int cached; - jclass clazz; - jfieldID ascent, descent, height, max_x_advance, max_y_advance; -} cairo_font_extents_t_FID_CACHE; - -cairo_font_extents_t_FID_CACHE cairo_font_extents_tFc; - -void cachecairo_font_extents_tFields(JNIEnv *env, jobject lpObject) -{ - if (cairo_font_extents_tFc.cached) return; - cairo_font_extents_tFc.clazz = (*env)->GetObjectClass(env, lpObject); - cairo_font_extents_tFc.ascent = (*env)->GetFieldID(env, cairo_font_extents_tFc.clazz, "ascent", "D"); - cairo_font_extents_tFc.descent = (*env)->GetFieldID(env, cairo_font_extents_tFc.clazz, "descent", "D"); - cairo_font_extents_tFc.height = (*env)->GetFieldID(env, cairo_font_extents_tFc.clazz, "height", "D"); - cairo_font_extents_tFc.max_x_advance = (*env)->GetFieldID(env, cairo_font_extents_tFc.clazz, "max_x_advance", "D"); - cairo_font_extents_tFc.max_y_advance = (*env)->GetFieldID(env, cairo_font_extents_tFc.clazz, "max_y_advance", "D"); - cairo_font_extents_tFc.cached = 1; -} - -cairo_font_extents_t *getcairo_font_extents_tFields(JNIEnv *env, jobject lpObject, cairo_font_extents_t *lpStruct) -{ - if (!cairo_font_extents_tFc.cached) cachecairo_font_extents_tFields(env, lpObject); - lpStruct->ascent = (*env)->GetDoubleField(env, lpObject, cairo_font_extents_tFc.ascent); - lpStruct->descent = (*env)->GetDoubleField(env, lpObject, cairo_font_extents_tFc.descent); - lpStruct->height = (*env)->GetDoubleField(env, lpObject, cairo_font_extents_tFc.height); - lpStruct->max_x_advance = (*env)->GetDoubleField(env, lpObject, cairo_font_extents_tFc.max_x_advance); - lpStruct->max_y_advance = (*env)->GetDoubleField(env, lpObject, cairo_font_extents_tFc.max_y_advance); - return lpStruct; -} - -void setcairo_font_extents_tFields(JNIEnv *env, jobject lpObject, cairo_font_extents_t *lpStruct) -{ - if (!cairo_font_extents_tFc.cached) cachecairo_font_extents_tFields(env, lpObject); - (*env)->SetDoubleField(env, lpObject, cairo_font_extents_tFc.ascent, (jdouble)lpStruct->ascent); - (*env)->SetDoubleField(env, lpObject, cairo_font_extents_tFc.descent, (jdouble)lpStruct->descent); - (*env)->SetDoubleField(env, lpObject, cairo_font_extents_tFc.height, (jdouble)lpStruct->height); - (*env)->SetDoubleField(env, lpObject, cairo_font_extents_tFc.max_x_advance, (jdouble)lpStruct->max_x_advance); - (*env)->SetDoubleField(env, lpObject, cairo_font_extents_tFc.max_y_advance, (jdouble)lpStruct->max_y_advance); -} -#endif - #ifndef NO_cairo_path_data_t typedef struct cairo_path_data_t_FID_CACHE { int cached; @@ -136,49 +93,3 @@ void setcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct } #endif -#ifndef NO_cairo_text_extents_t -typedef struct cairo_text_extents_t_FID_CACHE { - int cached; - jclass clazz; - jfieldID x_bearing, y_bearing, width, height, x_advance, y_advance; -} cairo_text_extents_t_FID_CACHE; - -cairo_text_extents_t_FID_CACHE cairo_text_extents_tFc; - -void cachecairo_text_extents_tFields(JNIEnv *env, jobject lpObject) -{ - if (cairo_text_extents_tFc.cached) return; - cairo_text_extents_tFc.clazz = (*env)->GetObjectClass(env, lpObject); - cairo_text_extents_tFc.x_bearing = (*env)->GetFieldID(env, cairo_text_extents_tFc.clazz, "x_bearing", "D"); - cairo_text_extents_tFc.y_bearing = (*env)->GetFieldID(env, cairo_text_extents_tFc.clazz, "y_bearing", "D"); - cairo_text_extents_tFc.width = (*env)->GetFieldID(env, cairo_text_extents_tFc.clazz, "width", "D"); - cairo_text_extents_tFc.height = (*env)->GetFieldID(env, cairo_text_extents_tFc.clazz, "height", "D"); - cairo_text_extents_tFc.x_advance = (*env)->GetFieldID(env, cairo_text_extents_tFc.clazz, "x_advance", "D"); - cairo_text_extents_tFc.y_advance = (*env)->GetFieldID(env, cairo_text_extents_tFc.clazz, "y_advance", "D"); - cairo_text_extents_tFc.cached = 1; -} - -cairo_text_extents_t *getcairo_text_extents_tFields(JNIEnv *env, jobject lpObject, cairo_text_extents_t *lpStruct) -{ - if (!cairo_text_extents_tFc.cached) cachecairo_text_extents_tFields(env, lpObject); - lpStruct->x_bearing = (*env)->GetDoubleField(env, lpObject, cairo_text_extents_tFc.x_bearing); - lpStruct->y_bearing = (*env)->GetDoubleField(env, lpObject, cairo_text_extents_tFc.y_bearing); - lpStruct->width = (*env)->GetDoubleField(env, lpObject, cairo_text_extents_tFc.width); - lpStruct->height = (*env)->GetDoubleField(env, lpObject, cairo_text_extents_tFc.height); - lpStruct->x_advance = (*env)->GetDoubleField(env, lpObject, cairo_text_extents_tFc.x_advance); - lpStruct->y_advance = (*env)->GetDoubleField(env, lpObject, cairo_text_extents_tFc.y_advance); - return lpStruct; -} - -void setcairo_text_extents_tFields(JNIEnv *env, jobject lpObject, cairo_text_extents_t *lpStruct) -{ - if (!cairo_text_extents_tFc.cached) cachecairo_text_extents_tFields(env, lpObject); - (*env)->SetDoubleField(env, lpObject, cairo_text_extents_tFc.x_bearing, (jdouble)lpStruct->x_bearing); - (*env)->SetDoubleField(env, lpObject, cairo_text_extents_tFc.y_bearing, (jdouble)lpStruct->y_bearing); - (*env)->SetDoubleField(env, lpObject, cairo_text_extents_tFc.width, (jdouble)lpStruct->width); - (*env)->SetDoubleField(env, lpObject, cairo_text_extents_tFc.height, (jdouble)lpStruct->height); - (*env)->SetDoubleField(env, lpObject, cairo_text_extents_tFc.x_advance, (jdouble)lpStruct->x_advance); - (*env)->SetDoubleField(env, lpObject, cairo_text_extents_tFc.y_advance, (jdouble)lpStruct->y_advance); -} -#endif - 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 4e8a012cde..96740656a6 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,24 +15,12 @@ * * IBM * - Binding to permit interfacing between Cairo and SWT - * - Copyright (C) 2005, 2012 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2013 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ #include "cairo.h" -#ifndef NO_cairo_font_extents_t -void cachecairo_font_extents_tFields(JNIEnv *env, jobject lpObject); -cairo_font_extents_t *getcairo_font_extents_tFields(JNIEnv *env, jobject lpObject, cairo_font_extents_t *lpStruct); -void setcairo_font_extents_tFields(JNIEnv *env, jobject lpObject, cairo_font_extents_t *lpStruct); -#define cairo_font_extents_t_sizeof() sizeof(cairo_font_extents_t) -#else -#define cachecairo_font_extents_tFields(a,b) -#define getcairo_font_extents_tFields(a,b,c) NULL -#define setcairo_font_extents_tFields(a,b,c) -#define cairo_font_extents_t_sizeof() 0 -#endif - #ifndef NO_cairo_path_data_t void cachecairo_path_data_tFields(JNIEnv *env, jobject lpObject); cairo_path_data_t *getcairo_path_data_tFields(JNIEnv *env, jobject lpObject, cairo_path_data_t *lpStruct); @@ -57,15 +45,3 @@ void setcairo_path_tFields(JNIEnv *env, jobject lpObject, cairo_path_t *lpStruct #define cairo_path_t_sizeof() 0 #endif -#ifndef NO_cairo_text_extents_t -void cachecairo_text_extents_tFields(JNIEnv *env, jobject lpObject); -cairo_text_extents_t *getcairo_text_extents_tFields(JNIEnv *env, jobject lpObject, cairo_text_extents_t *lpStruct); -void setcairo_text_extents_tFields(JNIEnv *env, jobject lpObject, cairo_text_extents_t *lpStruct); -#define cairo_text_extents_t_sizeof() sizeof(cairo_text_extents_t) -#else -#define cachecairo_text_extents_tFields(a,b) -#define getcairo_text_extents_tFields(a,b,c) NULL -#define setcairo_text_extents_tFields(a,b,c) -#define cairo_text_extents_t_sizeof() 0 -#endif - |