[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...
From: |
Mark Wielaard |
Subject: |
[commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav... |
Date: |
Wed, 14 Jun 2006 13:00:10 +0000 |
CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Mark Wielaard <mark> 06/06/14 13:00:09
Modified files:
. : ChangeLog
native/jni/gtk-peer: gnu_java_awt_peer_gtk_GtkImage.c
Log message:
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
(Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Return when
array
cannot be allocated.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7808&r2=1.7809
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c?cvsroot=classpath&r1=1.24&r2=1.25
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7808
retrieving revision 1.7809
diff -u -b -r1.7808 -r1.7809
--- ChangeLog 14 Jun 2006 12:35:16 -0000 1.7808
+++ ChangeLog 14 Jun 2006 13:00:09 -0000 1.7809
@@ -1,3 +1,9 @@
+2006-06-14 Mark Wielaard <address@hidden>
+
+ * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
+ (Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Return when array
+ cannot be allocated.
+
2006-06-14 Tom Tromey <address@hidden>
PR java/28024:
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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 8 Jun 2006
11:09:04 -0000 1.24
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 14 Jun 2006
13:00:09 -0000 1.25
@@ -166,6 +166,11 @@
rowstride = gdk_pixbuf_get_rowstride (pixbuf);
result_array = (*env)->NewIntArray (env, (width * height));
+ if (result_array == NULL)
+ {
+ gdk_threads_leave ();
+ return NULL;
+ }
dst = result_array_iter =
(*env)->GetIntArrayElements (env, result_array, NULL);
- [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav..., Andrew John Hughes, 2006/06/04
- [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav..., Mark Wielaard, 2006/06/08
- [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav..., Mark Wielaard, 2006/06/08
- [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav..., Sven de Marothy, 2006/06/09
- [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav..., Mark Wielaard, 2006/06/11
- [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav...,
Mark Wielaard <=
- [commit-cp] classpath ChangeLog native/jni/gtk-peer/gnu_jav..., Andreas Tobler, 2006/06/28