CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Mark Wielaard <mark> 06/06/10 14:16:10
Modified files:
. : ChangeLog
native/jni/gtk-peer: cairographics2d.h
gnu_java_awt_peer_gtk_CairoGraphics2D.c
gnu_java_awt_peer_gtk_CairoSurface.c
gnu_java_awt_peer_gtk_GdkTextLayout.c
gnu_java_awt_peer_gtk_GtkVolatileImage.c
include : gnu_java_awt_peer_gtk_CairoGraphics2D.h
gnu_java_awt_peer_gtk_CairoSurface.h
gnu_java_awt_peer_gtk_ComponentGraphics.h
gnu_java_awt_peer_gtk_GdkTextLayout.h
gnu_java_awt_peer_gtk_GtkVolatileImage.h
java_io_VMFile.h
Log message:
* 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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7761&r2=1.7762
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/cairographics2d.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c?cvsroot=classpath&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c?cvsroot=classpath&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c?cvsroot=classpath&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h?cvsroot=classpath&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h?cvsroot=classpath&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h?cvsroot=classpath&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/classpath/include/java_io_VMFile.h?cvsroot=classpath&r1=1.4&r2=1.5
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7761
retrieving revision 1.7762
diff -u -b -r1.7761 -r1.7762
--- ChangeLog 10 Jun 2006 14:06:23 -0000 1.7761
+++ ChangeLog 10 Jun 2006 14:16:08 -0000 1.7762
@@ -1,3 +1,28 @@
+2006-06-10 Mark Wielaard <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/VolatileImageGraphics.java
Index: native/jni/gtk-peer/cairographics2d.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/cairographics2d.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- native/jni/gtk-peer/cairographics2d.h 10 Jun 2006 10:33:16 -0000
1.3
+++ native/jni/gtk-peer/cairographics2d.h 10 Jun 2006 14:16:09 -0000
1.4
@@ -113,6 +113,4 @@
char *pattern_pixels;
};
-cairo_t *cp_gtk_get_cairo_t(JNIEnv *env, jlong pointer);
-
#endif
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c 10 Jun 2006
10:33:17 -0000 1.8
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c 10 Jun 2006
14:16:09 -0000 1.9
@@ -53,18 +53,6 @@
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 @@
*/
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 @@
*/
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
*/
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 @@
*/
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c 10 Jun 2006
10:33:17 -0000 1.17
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c 10 Jun 2006
14:16:09 -0000 1.18
@@ -74,7 +74,8 @@
*/
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 @@
*/
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 @@
*/
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 @@
*/
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 @@
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 @@
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 @@
*/
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 @@
*/
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;
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c 4 Jun 2006
17:52:05 -0000 1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c 10 Jun 2006
14:16:09 -0000 1.16
@@ -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 @@
*/
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);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c 10 Jun
2006 10:33:17 -0000 1.4
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c 10 Jun
2006 14:16:09 -0000 1.5
@@ -87,7 +87,8 @@
*/
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 @@
*/
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 @@
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;
Index: include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
===================================================================
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/gnu_java_awt_peer_gtk_CairoGraphics2D.h 10 Jun 2006 10:33:15
-0000 1.4
+++ include/gnu_java_awt_peer_gtk_CairoGraphics2D.h 10 Jun 2006 14:16:10
-0000 1.5
@@ -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__ */
Index: include/gnu_java_awt_peer_gtk_CairoSurface.h
===================================================================
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/gnu_java_awt_peer_gtk_CairoSurface.h 10 Jun 2006 10:33:15
-0000 1.4
+++ include/gnu_java_awt_peer_gtk_CairoSurface.h 10 Jun 2006 14:16:10
-0000 1.5
@@ -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__ */
Index: include/gnu_java_awt_peer_gtk_ComponentGraphics.h
===================================================================
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_ComponentGraphics.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- include/gnu_java_awt_peer_gtk_ComponentGraphics.h 10 Jun 2006 10:33:15
-0000 1.6
+++ include/gnu_java_awt_peer_gtk_ComponentGraphics.h 10 Jun 2006 14:16:10
-0000 1.7
@@ -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__ */
Index: include/gnu_java_awt_peer_gtk_GdkTextLayout.h
===================================================================
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkTextLayout.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- include/gnu_java_awt_peer_gtk_GdkTextLayout.h 1 Jun 2006 10:51:17
-0000 1.6
+++ include/gnu_java_awt_peer_gtk_GdkTextLayout.h 10 Jun 2006 14:16:10
-0000 1.7
@@ -16,7 +16,7 @@
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);
Index: include/gnu_java_awt_peer_gtk_GtkVolatileImage.h
===================================================================
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkVolatileImage.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/gnu_java_awt_peer_gtk_GtkVolatileImage.h 10 Jun 2006 10:33:15
-0000 1.3
+++ include/gnu_java_awt_peer_gtk_GtkVolatileImage.h 10 Jun 2006 14:16:10
-0000 1.4
@@ -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__ */
Index: include/java_io_VMFile.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_io_VMFile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- include/java_io_VMFile.h 7 Jun 2006 15:09:40 -0000 1.4
+++ include/java_io_VMFile.h 10 Jun 2006 14:16:10 -0000 1.5
@@ -24,7 +24,7 @@
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
