CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Mark Wielaard <mark> 06/06/08 11:09:04
Modified files:
. : ChangeLog
native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkImage.c
Log message:
PR 27917
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
(Java_gnu_java_awt_peer_gtk_GtkImage_loadImageFromData): Ref
pixbuf
and unref loader.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7714&r2=1.7715
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c?cvsroot=classpath&r1=1.23&r2=1.24
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7714
retrieving revision 1.7715
diff -u -b -r1.7714 -r1.7715
--- ChangeLog 8 Jun 2006 11:02:09 -0000 1.7714
+++ ChangeLog 8 Jun 2006 11:09:04 -0000 1.7715
@@ -1,5 +1,12 @@
2006-06-08 Mark Wielaard <[EMAIL PROTECTED]>
+ PR 27917
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
+ (Java_gnu_java_awt_peer_gtk_GtkImage_loadImageFromData): Ref pixbuf
+ and unref loader.
+
+2006-06-08 Mark Wielaard <[EMAIL PROTECTED]>
+
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c
(attrs): Removed unused static.
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
===================================================================
RCS file:
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 30 May 2006
11:30:02 -0000 1.23
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 8 Jun 2006
11:09:04 -0000 1.24
@@ -117,10 +117,14 @@
if (pixbuf == NULL)
{
+ g_object_unref (loader);
createRawData (env, obj, NULL);
return JNI_FALSE;
}
+ g_object_ref (pixbuf);
+ g_object_unref (loader);
+
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);