diff options
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | include/gnu_java_awt_peer_gtk_CairoGraphics2D.h | 254 | ||||
| -rw-r--r-- | include/gnu_java_awt_peer_gtk_CairoSurface.h | 115 | ||||
| -rw-r--r-- | include/gnu_java_awt_peer_gtk_ComponentGraphics.h | 83 | ||||
| -rw-r--r-- | include/gnu_java_awt_peer_gtk_GdkTextLayout.h | 2 | ||||
| -rw-r--r-- | include/gnu_java_awt_peer_gtk_GtkVolatileImage.h | 72 | ||||
| -rw-r--r-- | include/java_io_VMFile.h | 2 | ||||
| -rw-r--r-- | native/jni/gtk-peer/cairographics2d.h | 2 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c | 94 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c | 30 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c | 9 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c | 11 |
12 files changed, 188 insertions, 511 deletions
@@ -1,3 +1,28 @@ +2006-06-10 Mark Wielaard <mark@klomp.org> + + * native/jni/gtk-peer/cairographics2d.h (cp_gtk_get_cairo_t): + Removed. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c + Mark all unused parameters. + (cp_gtk_get_cairo_t): Removed. + (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix): + Don't mix declerations and statements. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c: + Mark all unused parameters. + (Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface): + Get cairographics2d pointer directly. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c + (Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout): + Use jlong to pass pointer. + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c: + Mark all unused parameters. + * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Regenerated. + * include/gnu_java_awt_peer_gtk_CairoSurface.h: Regenerated. + * include/gnu_java_awt_peer_gtk_ComponentGraphics.h: Regenerated. + * include/gnu_java_awt_peer_gtk_GdkTextLayout.h: Regenerated. + * include/gnu_java_awt_peer_gtk_GtkVolatileImage.h: Regenerated. + * include/java_io_VMFile.h: Regenerated. + 2006-06-10 Roman Kennke <kennke@aicas.com> * gnu/java/awt/peer/gtk/VolatileImageGraphics.java diff --git a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h index 1afb523ab..7a20949ed 100644 --- a/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h +++ b/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h @@ -1,229 +1,45 @@ /* DO NOT EDIT THIS FILE - it is machine generated */ + +#ifndef __gnu_java_awt_peer_gtk_CairoGraphics2D__ +#define __gnu_java_awt_peer_gtk_CairoGraphics2D__ + #include <jni.h> -/* Header for class gnu_java_awt_peer_gtk_CairoGraphics2D */ -#ifndef _Included_gnu_java_awt_peer_gtk_CairoGraphics2D -#define _Included_gnu_java_awt_peer_gtk_CairoGraphics2D #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: init - * Signature: (J)J - */ -JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: disposeNative - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: drawPixels - * Signature: (J[IIII[D)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels - (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: setGradient - * Signature: (JDDDDIIIIIIIIZ)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient - (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: setTexturePixels - * Signature: (J[IIII)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels - (JNIEnv *, jobject, jlong, jintArray, jint, jint, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoSetMatrix - * Signature: (J[D)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix - (JNIEnv *, jobject, jlong, jdoubleArray); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoSetOperator - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator - (JNIEnv *, jobject, jlong, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoSetRGBAColor - * Signature: (JDDDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor - (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoSetFillRule - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule - (JNIEnv *, jobject, jlong, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoSetLine - * Signature: (JDIID)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine - (JNIEnv *, jobject, jlong, jdouble, jint, jint, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoSetDash - * Signature: (J[DID)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash - (JNIEnv *, jobject, jlong, jdoubleArray, jint, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoDrawGlyphVector - * Signature: (JLgnu/java/awt/peer/gtk/GdkFontPeer;FFI[I[F)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector - (JNIEnv *, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoRelCurveTo - * Signature: (JDDDDDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo - (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoRectangle - * Signature: (JDDDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle - (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble); -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoNewPath - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoClosePath - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoMoveTo - * Signature: (JDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo - (JNIEnv *, jobject, jlong, jdouble, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoRelMoveTo - * Signature: (JDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo - (JNIEnv *, jobject, jlong, jdouble, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoLineTo - * Signature: (JDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo - (JNIEnv *, jobject, jlong, jdouble, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoRelLineTo - * Signature: (JDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo - (JNIEnv *, jobject, jlong, jdouble, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoCurveTo - * Signature: (JDDDDDD)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo - (JNIEnv *, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoStroke - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoFill - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoClip - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoPreserveClip - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoResetClip - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoGraphics2D - * Method: cairoSurfaceSetFilter - * Signature: (JI)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter - (JNIEnv *, jobject, jlong, jint); +JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint, jdoubleArray); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jint, jint, jint, jint, jint, jint, jint, jint, jboolean); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels (JNIEnv *env, jobject, jlong, jintArray, jint, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix (JNIEnv *env, jobject, jlong, jdoubleArray); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator (JNIEnv *env, jobject, jlong, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule (JNIEnv *env, jobject, jlong, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine (JNIEnv *env, jobject, jlong, jdouble, jint, jint, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash (JNIEnv *env, jobject, jlong, jdoubleArray, jint, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector (JNIEnv *env, jobject, jlong, jobject, jfloat, jfloat, jint, jintArray, jfloatArray); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo (JNIEnv *env, jobject, jlong, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo (JNIEnv *env, jobject, jlong, jdouble, jdouble, jdouble, jdouble, jdouble, jdouble); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter (JNIEnv *env, jobject, jlong, jint); #ifdef __cplusplus } #endif -#endif + +#endif /* __gnu_java_awt_peer_gtk_CairoGraphics2D__ */ diff --git a/include/gnu_java_awt_peer_gtk_CairoSurface.h b/include/gnu_java_awt_peer_gtk_CairoSurface.h index 35fba3f89..8899349e1 100644 --- a/include/gnu_java_awt_peer_gtk_CairoSurface.h +++ b/include/gnu_java_awt_peer_gtk_CairoSurface.h @@ -1,107 +1,28 @@ /* DO NOT EDIT THIS FILE - it is machine generated */ + +#ifndef __gnu_java_awt_peer_gtk_CairoSurface__ +#define __gnu_java_awt_peer_gtk_CairoSurface__ + #include <jni.h> -/* Header for class gnu_java_awt_peer_gtk_CairoSurface */ -#ifndef _Included_gnu_java_awt_peer_gtk_CairoSurface -#define _Included_gnu_java_awt_peer_gtk_CairoSurface #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE -#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_BYTE 0L -#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT -#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_USHORT 1L -#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT -#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_SHORT 2L -#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT -#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_INT 3L -#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT -#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_FLOAT 4L -#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE -#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_DOUBLE 5L -#undef gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED -#define gnu_java_awt_peer_gtk_CairoSurface_TYPE_UNDEFINED 32L -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: create - * Signature: (III)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create - (JNIEnv *, jobject, jint, jint, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: destroy - * Signature: (JJ)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy - (JNIEnv *, jobject, jlong, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: nativeGetElem - * Signature: (JI)I - */ -JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem - (JNIEnv *, jobject, jlong, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: nativeSetElem - * Signature: (JII)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem - (JNIEnv *, jobject, jlong, jint, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: nativeDrawSurface - * Signature: (JJ[D)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface - (JNIEnv *, jobject, jlong, jlong, jdoubleArray); -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: nativeGetPixels - * Signature: (JI)[I - */ -JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels - (JNIEnv *, jobject, jlong, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: nativeSetPixels - * Signature: (J[I)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels - (JNIEnv *, jobject, jlong, jintArray); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: getFlippedBuffer - * Signature: (JI)J - */ -JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer - (JNIEnv *, jobject, jlong, jint); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: nativeNewCairoContext - * Signature: (J)J - */ -JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_CairoSurface - * Method: copyAreaNative2 - * Signature: (JIIIIIII)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2 - (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_create (JNIEnv *env, jobject, jint, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy (JNIEnv *env, jobject, jlong, jlong); +JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem (JNIEnv *env, jobject, jlong, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem (JNIEnv *env, jobject, jlong, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface (JNIEnv *env, jobject, jlong, jlong, jdoubleArray); +JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels (JNIEnv *env, jobject, jlong, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels (JNIEnv *env, jobject, jlong, jintArray); +JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer (JNIEnv *env, jobject, jlong, jint); +JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2 (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint, jint); #ifdef __cplusplus } #endif -#endif + +#endif /* __gnu_java_awt_peer_gtk_CairoSurface__ */ diff --git a/include/gnu_java_awt_peer_gtk_ComponentGraphics.h b/include/gnu_java_awt_peer_gtk_ComponentGraphics.h index f88ad592b..4fd597eff 100644 --- a/include/gnu_java_awt_peer_gtk_ComponentGraphics.h +++ b/include/gnu_java_awt_peer_gtk_ComponentGraphics.h @@ -1,77 +1,26 @@ /* DO NOT EDIT THIS FILE - it is machine generated */ + +#ifndef __gnu_java_awt_peer_gtk_ComponentGraphics__ +#define __gnu_java_awt_peer_gtk_ComponentGraphics__ + #include <jni.h> -/* Header for class gnu_java_awt_peer_gtk_ComponentGraphics */ -#ifndef _Included_gnu_java_awt_peer_gtk_ComponentGraphics -#define _Included_gnu_java_awt_peer_gtk_ComponentGraphics #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: initState - * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;)J - */ -JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState - (JNIEnv *, jobject, jobject); - -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: disposeSurface - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: initFromVolatile - * Signature: (JII)J - */ -JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile - (JNIEnv *, jobject, jlong, jint, jint); - -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: start_gdk_drawing - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing - (JNIEnv *, jobject); -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: end_gdk_drawing - * Signature: ()V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing - (JNIEnv *, jobject); - -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: hasXRender - * Signature: ()Z - */ -JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender - (JNIEnv *, jclass); - -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: copyAreaNative - * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;IIIIII)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative - (JNIEnv *, jobject, jobject, jint, jint, jint, jint, jint, jint); - -/* - * Class: gnu_java_awt_peer_gtk_ComponentGraphics - * Method: drawVolatile - * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;JIIII)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile - (JNIEnv *, jobject, jobject, jlong, jint, jint, jint, jint); +JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initState (JNIEnv *env, jobject, jobject); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_disposeSurface (JNIEnv *env, jobject, jlong); +JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_initFromVolatile (JNIEnv *env, jobject, jlong, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_start_1gdk_1drawing (JNIEnv *env, jobject); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_end_1gdk_1drawing (JNIEnv *env, jobject); +JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_hasXRender (JNIEnv *env, jclass); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_copyAreaNative (JNIEnv *env, jobject, jobject, jint, jint, jint, jint, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_ComponentGraphics_drawVolatile (JNIEnv *env, jobject, jobject, jlong, jint, jint, jint, jint); #ifdef __cplusplus } #endif -#endif + +#endif /* __gnu_java_awt_peer_gtk_ComponentGraphics__ */ diff --git a/include/gnu_java_awt_peer_gtk_GdkTextLayout.h b/include/gnu_java_awt_peer_gtk_GdkTextLayout.h index 680c4165f..fae4d775b 100644 --- a/include/gnu_java_awt_peer_gtk_GdkTextLayout.h +++ b/include/gnu_java_awt_peer_gtk_GdkTextLayout.h @@ -16,7 +16,7 @@ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_getExtents (JNIE JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_indexToPos (JNIEnv *env, jobject, jint, jdoubleArray); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_initState (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_dispose (JNIEnv *env, jobject); -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout (JNIEnv *env, jobject, jobject, jfloat, jfloat); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout (JNIEnv *env, jobject, jlong, jfloat, jfloat); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_initStaticState (JNIEnv *env, jclass); JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_getOutline (JNIEnv *env, jobject, jobject); diff --git a/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h b/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h index 2714535d4..43b55e828 100644 --- a/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h +++ b/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h @@ -1,69 +1,23 @@ /* DO NOT EDIT THIS FILE - it is machine generated */ + +#ifndef __gnu_java_awt_peer_gtk_GtkVolatileImage__ +#define __gnu_java_awt_peer_gtk_GtkVolatileImage__ + #include <jni.h> -/* Header for class gnu_java_awt_peer_gtk_GtkVolatileImage */ -#ifndef _Included_gnu_java_awt_peer_gtk_GtkVolatileImage -#define _Included_gnu_java_awt_peer_gtk_GtkVolatileImage #ifdef __cplusplus -extern "C" { +extern "C" +{ #endif -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT -#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_DEFAULT 1L -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST -#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_FAST 2L -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH -#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_SMOOTH 4L -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE -#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_REPLICATE 8L -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING -#define gnu_java_awt_peer_gtk_GtkVolatileImage_SCALE_AREA_AVERAGING 16L -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK -#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_OK 0L -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED -#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_RESTORED 1L -#undef gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE -#define gnu_java_awt_peer_gtk_GtkVolatileImage_IMAGE_INCOMPATIBLE 2L -/* - * Class: gnu_java_awt_peer_gtk_GtkVolatileImage - * Method: init - * Signature: (Lgnu/java/awt/peer/gtk/GtkComponentPeer;II)J - */ -JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init - (JNIEnv *, jobject, jobject, jint, jint); - -/* - * Class: gnu_java_awt_peer_gtk_GtkVolatileImage - * Method: destroy - * Signature: (J)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy - (JNIEnv *, jobject, jlong); - -/* - * Class: gnu_java_awt_peer_gtk_GtkVolatileImage - * Method: nativeGetPixels - * Signature: (J)[I - */ -JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels - (JNIEnv *, jobject, jlong); -/* - * Class: gnu_java_awt_peer_gtk_GtkVolatileImage - * Method: nativeCopyArea - * Signature: (JIIIIII)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea - (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint); - -/* - * Class: gnu_java_awt_peer_gtk_GtkVolatileImage - * Method: nativeDrawVolatile - * Signature: (JJIIII)V - */ -JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile - (JNIEnv *, jobject, jlong, jlong, jint, jint, jint, jint); +JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject, jobject, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy (JNIEnv *env, jobject, jlong); +JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels (JNIEnv *env, jobject, jlong); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea (JNIEnv *env, jobject, jlong, jint, jint, jint, jint, jint, jint); +JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile (JNIEnv *env, jobject, jlong, jlong, jint, jint, jint, jint); #ifdef __cplusplus } #endif -#endif + +#endif /* __gnu_java_awt_peer_gtk_GtkVolatileImage__ */ diff --git a/include/java_io_VMFile.h b/include/java_io_VMFile.h index a390a1992..fa1079f12 100644 --- a/include/java_io_VMFile.h +++ b/include/java_io_VMFile.h @@ -24,7 +24,7 @@ JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isFile (JNIEnv *env, jclass, jstr JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canWrite (JNIEnv *env, jclass, jstring); JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canRead (JNIEnv *env, jclass, jstring); JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isDirectory (JNIEnv *env, jclass, jstring); -JNIEXPORT jstring JNICALL Java_java_io_VMFile_toCanonicalForm (JNIEnv *env,jclass, jstring); +JNIEXPORT jstring JNICALL Java_java_io_VMFile_toCanonicalForm (JNIEnv *env, jclass, jstring); #undef java_io_VMFile_IS_CASE_SENSITIVE #define java_io_VMFile_IS_CASE_SENSITIVE 1L #undef java_io_VMFile_IS_DOS_8_3 diff --git a/native/jni/gtk-peer/cairographics2d.h b/native/jni/gtk-peer/cairographics2d.h index e524e35ad..675bc0b17 100644 --- a/native/jni/gtk-peer/cairographics2d.h +++ b/native/jni/gtk-peer/cairographics2d.h @@ -113,6 +113,4 @@ struct cairographics2d char *pattern_pixels; }; -cairo_t *cp_gtk_get_cairo_t(JNIEnv *env, jlong pointer); - #endif diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c index c473a2623..8ac89cffe 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c @@ -53,18 +53,6 @@ static void install_font_peer(cairo_t *cr, struct peerfont *pfont); static void update_pattern_transform (struct cairographics2d *gr); /** - * Returns the cairo_t * associated with a CairoGraphics2D object, - * This is used by GdkTextLayout. - */ -cairo_t *cp_gtk_get_cairo_t(JNIEnv *env, - jlong pointer) -{ - struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); - g_assert(gr != NULL); - return gr->cr; -} - -/** * Allocates the cairographics2d structure. */ JNIEXPORT jlong JNICALL @@ -91,7 +79,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_init */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative - (JNIEnv *env, jobject obj, jlong pointer) + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); @@ -121,7 +110,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_disposeNative */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient -(JNIEnv *env, jobject obj, jlong pointer, + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble x1, jdouble y1, jdouble x2, jdouble y2, jint r1, jint g1, jint b1, jint a1, @@ -154,8 +144,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels -(JNIEnv *env, jobject obj, jlong pointer, jintArray jarr, jint w, jint h, - jint stride) + (JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jintArray jarr, jint w, jint h, jint stride) { struct cairographics2d *gr = NULL; jint *jpixels = NULL; @@ -196,7 +186,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_setTexturePixels JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels -(JNIEnv *env, jobject obj, jlong pointer, jintArray java_pixels, +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jintArray java_pixels, jint w, jint h, jint stride, jdoubleArray java_matrix) { jint *native_pixels = NULL; @@ -239,11 +230,12 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetMatrix - (JNIEnv *env, jobject obj, jlong pointer, jdoubleArray java_matrix) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdoubleArray java_matrix) { jdouble *native_matrix = NULL; - g_assert (obj != NULL); struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); + g_assert (obj != NULL); g_assert (gr != NULL); native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL); @@ -318,7 +310,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator - (JNIEnv *env, jobject obj, jlong pointer, jint op) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jint op) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -377,8 +370,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetOperator JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor -(JNIEnv *env, jobject obj, jlong pointer, jdouble r, jdouble g, jdouble b, - jdouble a) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble r, jdouble g, jdouble b, jdouble a) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -388,7 +381,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetRGBAColor JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule - (JNIEnv *env, jobject obj, jlong pointer, jint rule) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jint rule) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -409,8 +403,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetFillRule */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine -(JNIEnv *env, jobject obj, jlong pointer, jdouble width, int cap, int join, - double miterLimit) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble width, int cap, int join, double miterLimit) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -459,8 +453,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetLine */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash -(JNIEnv *env, jobject obj, jlong pointer, jdoubleArray dashes, jint ndash, - jdouble offset) +(JNIEnv *env, jobject obj __attribute__((unused)), + jlong pointer, jdoubleArray dashes, jint ndash, jdouble offset) { jdouble *dasharr = NULL; struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); @@ -476,7 +470,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSetDash JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath - (JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -486,7 +481,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoNewPath JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo - (JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble x, jdouble y) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -496,7 +492,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoMoveTo JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo -(JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble x, jdouble y) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -506,7 +503,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoLineTo JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo -(JNIEnv *env, jobject obj, jlong pointer, jdouble x1, jdouble y1, +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble x1, jdouble y1, jdouble x2, jdouble y2, jdouble x3, jdouble y3) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); @@ -516,7 +514,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoCurveTo JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo - (JNIEnv *env, jobject obj, jlong pointer, jdouble dx, jdouble dy) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble dx, jdouble dy) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -526,7 +525,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelMoveTo JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo - (JNIEnv *env, jobject obj, jlong pointer, jdouble dx, jdouble dy) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble dx, jdouble dy) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -536,7 +536,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelLineTo JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo -(JNIEnv *env, jobject obj, jlong pointer, jdouble dx1, jdouble dy1, +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble dx1, jdouble dy1, jdouble dx2, jdouble dy2, jdouble dx3, jdouble dy3) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); @@ -547,8 +548,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRelCurveTo JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle -(JNIEnv *env, jobject obj, jlong pointer, jdouble x, jdouble y, - jdouble width, jdouble height) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jdouble x, jdouble y, jdouble width, jdouble height) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); @@ -557,7 +558,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoRectangle JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath - (JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -567,7 +569,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClosePath JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke - (JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -577,7 +580,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoStroke JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill -(JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -587,7 +591,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoFill JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip -(JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert( gr != NULL ); @@ -597,7 +602,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoClip JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip -(JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -607,7 +613,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoResetClip JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip -(JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); @@ -617,7 +624,8 @@ Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoPreserveClip JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter - (JNIEnv *env, jobject obj, jlong pointer, jint filter) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong pointer, jint filter) { struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, pointer); g_assert (gr != NULL); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c index 45f2effd4..3efa60d62 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c @@ -74,7 +74,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_create (JNIEnv *env, jobject obj, jint w */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_destroy -(JNIEnv *env, jobject obj, jlong surfacePointer, jlong bufferPointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong surfacePointer, jlong bufferPointer) { void *buffer; cairo_surface_t* surface = JLONG_TO_PTR(void, surfacePointer); @@ -91,7 +92,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_destroy */ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem -(JNIEnv *env, jobject obj, jlong bufferPointer, jint i) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong bufferPointer, jint i) { jint *pixeldata = JLONG_TO_PTR(void, bufferPointer); @@ -106,7 +108,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetElem */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem -(JNIEnv *env, jobject obj, jlong bufferPointer, jint i, jint val) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong bufferPointer, jint i, jint val) { jint *pixeldata = JLONG_TO_PTR(void, bufferPointer); @@ -121,7 +124,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetElem */ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeGetPixels -(JNIEnv *env, jobject obj, jlong bufferPointer, int size) +(JNIEnv *env __attribute((unused)), jobject obj __attribute((unused)), + jlong bufferPointer, int size) { jint *pixeldata, *jpixdata; jintArray jpixels; @@ -176,15 +180,14 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeSetPixels JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface -(JNIEnv *env, jobject obj, jlong surfacePointer, jlong context, - jdoubleArray java_matrix) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong surfacePointer, jlong context, jdoubleArray java_matrix) { - cairo_t *cr; + struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, context); + cairo_t *cr = gr->cr; jdouble *native_matrix = NULL; cairo_surface_t* surface = JLONG_TO_PTR(void, surfacePointer); g_assert(surface != NULL); - - cr = cp_gtk_get_cairo_t(env, context); g_assert(cr != NULL); native_matrix = (*env)->GetDoubleArrayElements (env, java_matrix, NULL); @@ -213,7 +216,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer -(JNIEnv *env, jobject obj, jlong bufferPointer, jint size) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong bufferPointer, jint size) { jint *dst; jint *src = JLONG_TO_PTR(void, bufferPointer); @@ -239,7 +243,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_getFlippedBuffer */ JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext -(JNIEnv *env, jobject obj, jlong surfacePointer) +(JNIEnv *env __attribute((unused)), jobject obj __attribute((unused)), + jlong surfacePointer) { cairo_surface_t* surface = JLONG_TO_PTR(cairo_surface_t, surfacePointer); cairo_t *ptr; @@ -255,7 +260,8 @@ Java_gnu_java_awt_peer_gtk_CairoSurface_nativeNewCairoContext */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_CairoSurface_copyAreaNative2 -(JNIEnv *env, jobject obj, jlong bufferPointer, +(JNIEnv *env __attribute__((unused)), jobject obj __attribute__((unused)), + jlong bufferPointer, jint x, jint y, jint w, jint h, jint dx, jint dy, jint stride) { int row; diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c index 92f2d37ca..849998791 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c @@ -44,6 +44,7 @@ #include <pango/pangofc-font.h> #include <freetype/ftglyph.h> #include <freetype/ftoutln.h> +#include "jcl.h" #include "native_state.h" #include "gdkfont.h" #include "gnu_java_awt_peer_gtk_GdkTextLayout.h" @@ -239,23 +240,21 @@ Java_gnu_java_awt_peer_gtk_GdkTextLayout_dispose */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkTextLayout_cairoDrawGdkTextLayout - (JNIEnv *env, jobject obj, jobject cairographics, jfloat x, jfloat y) + (JNIEnv *env, jobject obj, jlong cg2d, jfloat x, jfloat y) { /* * FIXME: Some day we expect either cairo or pango will know how to make * a pango layout paint to a cairo surface. that day is not yet here. */ - cairo_t *cr; + struct cairographics2d *gr = JLONG_TO_PTR(struct cairographics2d, cg2d); + cairo_t *cr = gr->cr; struct textlayout *tl = NULL; PangoLayoutIter *i = NULL; PangoLayoutRun *run = NULL; cairo_glyph_t *glyphs = NULL; gint n_glyphs = 0; - g_assert (cairographics != NULL); - - cr = cp_gtk_get_cairo_t(env, cairographics); tl = (struct textlayout *)NSA_GET_TEXT_LAYOUT_PTR (env, obj); g_assert (cr != NULL); diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c index 6949fda5c..d7ef474e0 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c @@ -87,7 +87,8 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_destroy -(JNIEnv *env, jobject obj, jlong pointer) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)), + jlong pointer) { GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer); if( pixmap != NULL ) @@ -146,8 +147,8 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeGetPixels */ JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea -(JNIEnv *env, jobject obj, jlong pointer, jint x, jint y, jint w, jint h, - jint dx, jint dy) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)), + jlong pointer, jint x, jint y, jint w, jint h, jint dx, jint dy) { GdkPixbuf *pixbuf; GdkPixmap* pixmap = JLONG_TO_PTR(GdkPixmap, pointer); @@ -167,8 +168,8 @@ Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeCopyArea JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkVolatileImage_nativeDrawVolatile -(JNIEnv *env, jobject obj, jlong pointer, jlong srcptr, jint x, jint y, jint w, - jint h) +(JNIEnv *env __attribute__((unused)), jobject obj __attribute((unused)), + jlong pointer, jlong srcptr, jint x, jint y, jint w, jint h) { GdkPixmap *dst, *src; GdkGC *gc; |