Hi,
Left some of the JNI functions in an inconsistent state after yesterday's
update and didn't notice until I tried building with
--enable-regen-headers... whoops!
2007-02-22 Francis Kung <[EMAIL PROTECTED]>
* gnu/java/awt/peer/gtk/CairoSurface.java
(copyAreaNative): Pass surface pointer into copyAreaNative2().
(copyAreaNative2): Add parameter for surface pointer.
(getFlippedBuffer): Add parameter for surface pointer.
(getGtkImage): Pass surface pointer into getFlippedBuffer().
Index: gnu/java/awt/peer/gtk/CairoSurface.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/CairoSurface.java,v
retrieving revision 1.25
diff -u -r1.25 CairoSurface.java
--- gnu/java/awt/peer/gtk/CairoSurface.java 21 Feb 2007 21:47:37 -0000 1.25
+++ gnu/java/awt/peer/gtk/CairoSurface.java 22 Feb 2007 21:16:42 -0000
@@ -155,7 +155,7 @@
* @return A pointer to a flipped buffer. The memory is allocated in native
* code, and must be explicitly freed when it is no longer needed.
*/
- native long getFlippedBuffer();
+ native long getFlippedBuffer(long surfacePointer);
/**
* Create a cairo_surface_t with specified width and height.
@@ -268,7 +268,7 @@
*/
public GtkImage getGtkImage()
{
- return new GtkImage(width, height, getFlippedBuffer());
+ return new GtkImage(width, height, getFlippedBuffer(surfacePointer));
}
/**
@@ -343,9 +343,10 @@
public void copyAreaNative(int x, int y, int width,
int height, int dx, int dy, int stride)
{
- copyAreaNative2(x, y, width, height, dx, dy, stride);
+ copyAreaNative2(surfacePointer, x, y, width, height, dx, dy, stride);
}
- native void copyAreaNative2(int x, int y, int width, int height,
+ native void copyAreaNative2(long surfacePointer,
+ int x, int y, int width, int height,
int dx, int dy, int stride);
/**
