CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Andrew John Hughes <gnu_andrew> 06/06/04 17:52:05
Modified files:
. : ChangeLog
native/jni/gtk-peer: gnu_java_awt_peer_gtk_ComponentGraphics.c
gnu_java_awt_peer_gtk_GdkTextLayout.c
gnu_java_awt_peer_gtk_GtkVolatileImage.c
Log message:
2006-06-04 Andrew John Hughes <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:
(drawVolatile): Add casts.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
(getOutline): Add casts.
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
Comment out unused prototype.
(getPixels): Add appropriate cast and comment out unused
variable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7645&r2=1.7646
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c?cvsroot=classpath&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c?cvsroot=classpath&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c?cvsroot=classpath&r1=1.1&r2=1.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7645
retrieving revision 1.7646
diff -u -b -r1.7645 -r1.7646
--- ChangeLog 4 Jun 2006 06:57:25 -0000 1.7645
+++ ChangeLog 4 Jun 2006 17:52:05 -0000 1.7646
@@ -1,3 +1,13 @@
+2006-06-04 Andrew John Hughes <[EMAIL PROTECTED]>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c:
+ (drawVolatile): Add casts.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c:
+ (getOutline): Add casts.
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c:
+ Comment out unused prototype.
+ (getPixels): Add appropriate cast and comment out unused variable.
+
2006-06-04 Raif S. Naffah <[EMAIL PROTECTED]>
* gnu/javax/crypto/sasl/SaslUtil.java: Remove unused import.
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c 3 Jun
2006 22:41:41 -0000 1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphics.c 4 Jun
2006 17:52:05 -0000 1.11
@@ -228,12 +228,12 @@
g_assert (widget != NULL);
while(widget->window != NULL)
- widget = widget->window;
+ widget = GTK_WIDGET(widget->window);
pixmap = cp_gtk_get_pixmap( env, img );
- gc = gdk_gc_new( widget );
- gdk_draw_drawable(widget,
+ gc = gdk_gc_new(GDK_DRAWABLE(widget));
+ gdk_draw_drawable(GDK_DRAWABLE(widget),
gc,
pixmap,
0, 0,
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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c 1 Jun 2006
10:51:17 -0000 1.14
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c 4 Jun 2006
17:52:05 -0000 1.15
@@ -444,10 +444,10 @@
PangoLayoutLine *current_line;
FT_Outline_Funcs ftCallbacks =
{
- _moveTo,
- _lineTo,
- _quadTo,
- _curveTo,
+ (FT_Outline_MoveToFunc) _moveTo,
+ (FT_Outline_LineToFunc) _lineTo,
+ (FT_Outline_ConicToFunc) _quadTo,
+ (FT_Outline_CubicToFunc) _curveTo,
0,
0
};
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c 3 Jun
2006 22:41:41 -0000 1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkVolatileImage.c 4 Jun
2006 17:52:05 -0000 1.2
@@ -49,7 +49,7 @@
/* prototypes */
static void *getNativeObject( JNIEnv *env, jobject obj );
-static void setNativeObject( JNIEnv *env, jobject obj, void *ptr );
+/* static void setNativeObject( JNIEnv *env, jobject obj, void *ptr ); */
GdkPixmap *cp_gtk_get_pixmap( JNIEnv *env, jobject obj);
@@ -57,7 +57,8 @@
* Creates a cairo surface, ARGB32, native ordering, premultiplied alpha.
*/
JNIEXPORT jlong JNICALL
-Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env, jobject obj,
+Java_gnu_java_awt_peer_gtk_GtkVolatileImage_init (JNIEnv *env,
+ jobject obj __attribute__
((__unused__)),
jobject peer,
jint width, jint height)
{
@@ -108,7 +109,8 @@
Java_gnu_java_awt_peer_gtk_GtkVolatileImage_getPixels
(JNIEnv *env, jobject obj)
{
- jint *pixeldata, *jpixdata;
+ /* jint *pixeldata, *jpixdata; */
+ jint *jpixdata;
GdkPixmap *pixmap;
jintArray jpixels;
int width, height, depth, size;
@@ -124,7 +126,7 @@
g_assert (field != 0);
height = (*env)->GetIntField (env, obj, field);
- pixmap = (jint *)getNativeObject(env, obj);
+ pixmap = GDK_PIXMAP(getNativeObject(env, obj));
g_assert(pixmap != NULL);
gdk_threads_enter();
