diff options
author | Alexander Kurtakov | 2017-06-27 19:23:23 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2017-06-27 19:23:23 +0000 |
commit | 2a49dd626797792c93cb167892ffe288ca88fe79 (patch) | |
tree | 28370216f880bcd46d2dca4a55252cdf2a182882 /bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library | |
parent | a1c0d04e0979e30a3b0fd5ac1090fbc42c7a72ac (diff) | |
download | eclipse.platform.swt-2a49dd626797792c93cb167892ffe288ca88fe79.tar.gz eclipse.platform.swt-2a49dd626797792c93cb167892ffe288ca88fe79.tar.xz eclipse.platform.swt-2a49dd626797792c93cb167892ffe288ca88fe79.zip |
Bug 518855 - Remove workarounds for Cairo older than 1.8.0I20170627-2000
Change-Id: I63655797878979b0f1452e2c288079b5c15c6d3e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/cairo/library')
3 files changed, 3 insertions, 19 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 f2a4258500..d2f00fe26b 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, 2016 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2017 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -519,20 +519,6 @@ fail: } #endif -#ifndef NO__1cairo_1matrix_1init_1translate -JNIEXPORT void JNICALL Cairo_NATIVE(_1cairo_1matrix_1init_1translate) - (JNIEnv *env, jclass that, jdoubleArray arg0, jdouble arg1, jdouble arg2) -{ - jdouble *lparg0=NULL; - Cairo_NATIVE_ENTER(env, that, _1cairo_1matrix_1init_1translate_FUNC); - if (arg0) if ((lparg0 = (*env)->GetDoubleArrayElements(env, arg0, NULL)) == NULL) goto fail; - cairo_matrix_init_translate((cairo_matrix_t *)lparg0, arg1, arg2); -fail: - if (arg0 && lparg0) (*env)->ReleaseDoubleArrayElements(env, arg0, lparg0, 0); - Cairo_NATIVE_EXIT(env, that, _1cairo_1matrix_1init_1translate_FUNC); -} -#endif - #ifndef NO__1cairo_1matrix_1invert JNIEXPORT jint JNICALL Cairo_NATIVE(_1cairo_1matrix_1invert) (JNIEnv *env, jclass that, jdoubleArray arg0) 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 f69fba6ea3..35fbf28a08 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, 2016 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2017 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -70,7 +70,6 @@ char * Cairo_nativeFunctionNames[] = { "_1cairo_1matrix_1init_1identity", "_1cairo_1matrix_1init_1rotate", "_1cairo_1matrix_1init_1scale", - "_1cairo_1matrix_1init_1translate", "_1cairo_1matrix_1invert", "_1cairo_1matrix_1multiply", "_1cairo_1matrix_1rotate", 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 f995f0470a..2edc6439b3 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, 2016 IBM Corp. All Rights Reserved. + * - Copyright (C) 2005, 2017 IBM Corp. All Rights Reserved. * * ***** END LICENSE BLOCK ***** */ @@ -80,7 +80,6 @@ typedef enum { _1cairo_1matrix_1init_1identity_FUNC, _1cairo_1matrix_1init_1rotate_FUNC, _1cairo_1matrix_1init_1scale_FUNC, - _1cairo_1matrix_1init_1translate_FUNC, _1cairo_1matrix_1invert_FUNC, _1cairo_1matrix_1multiply_FUNC, _1cairo_1matrix_1rotate_FUNC, |