This patch swaps two assertions and solves one bug :-) 2007-07-10 Roman Kennke <[EMAIL PROTECTED]>
PR 32645 * native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c (copyPixbuf): Swap asserts. /Roman -- Dipl.-Inform. (FH) Roman Kennke, Software Engineer, http://kennke.org aicas Allerton Interworks Computer Automated Systems GmbH Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany http://www.aicas.com * Tel: +49-721-663 968-0 USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe Geschäftsführer: Dr. James J. Hunt
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c =================================================================== RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c,v retrieving revision 1.5 diff -u -1 -0 -r1.5 gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c --- native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c 21 Jun 2007 14:07:01 -0000 1.5 +++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_ComponentGraphicsCopy.c 10 Jul 2007 14:31:52 -0000 @@ -101,24 +101,24 @@ gint pwidth, pheight; GdkPixbuf *pixbuf; GdkDrawable *drawable; GdkWindow *win; GtkWidget *widget = NULL; void *ptr = NULL; gdk_threads_enter(); ptr = gtkpeer_get_widget (env, peer); - g_assert (widget != NULL); + g_assert (ptr != NULL); widget = GTK_WIDGET (ptr); - g_assert (ptr != NULL); + g_assert (widget != NULL); cp_gtk_grab_current_drawable (widget, &drawable, &win); g_assert (drawable != NULL); pixbuf = cp_gtk_image_get_pixbuf( env, image ); g_assert( pixbuf != NULL); pwidth = gdk_pixbuf_get_width( pixbuf ); pheight = gdk_pixbuf_get_height( pixbuf );