[Bug awt/27507] IllegalArgumentException when trying to draw a non-existent Image with Graphics2D

[cvs-commit at developer dot classpath dot org]

------- Comment #2 from cvs-commit at developer dot classpath dot org  
2006-06-05 13:50 -------
Subject: Bug 27507

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Lillian Angel <langel>  06/06/05 13:47:04

Modified files:
        .              : ChangeLog 
        gnu/java/awt/peer/gtk: GtkImage.java GtkToolkit.java 

Log message:
        2006-06-05  Francis Kung  <address@hidden>

                PR 27507
                * gnu/java/awt/peer/gtk/GtkImage.java
                (getSource): Added check to determine if in
                errorLoading state.
                * gnu/java/awt/peer/gtk/GtkToolkit.java
                (createImage): Added check to prevent NPE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7655&r2=1.7656
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkImage.java?cvsroot=classpath&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java?cvsroot=classpath&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7655
retrieving revision 1.7656
diff -u -b -r1.7655 -r1.7656
--- ChangeLog   5 Jun 2006 12:38:30 -0000       1.7655
+++ ChangeLog   5 Jun 2006 13:47:02 -0000       1.7656
@@ -1,3 +1,12 @@
+2006-06-05  Francis Kung  <address@hidden>
+       
+       PR 27507
+       * gnu/java/awt/peer/gtk/GtkImage.java
+       (getSource): Added check to determine if in
+       errorLoading state.
+       * gnu/java/awt/peer/gtk/GtkToolkit.java
+       (createImage): Added check to prevent NPE.
+
 2006-06-05  Audrius Meskauskas  <address@hidden>

        * javax/swing/text/html/HTMLEditorKit.java (HTMLFactory.create):

Index: gnu/java/awt/peer/gtk/GtkImage.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkImage.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gnu/java/awt/peer/gtk/GtkImage.java 30 May 2006 21:42:56 -0000      1.33
+++ gnu/java/awt/peer/gtk/GtkImage.java 5 Jun 2006 13:47:04 -0000       1.34
@@ -421,9 +421,12 @@
       return null;

     int[] pixels;
-    synchronized(pixbufLock)
+    synchronized (pixbufLock)
       {
+        if (!errorLoading)
        pixels = getPixels();
+        else
+          return null;
       }
     return new MemoryImageSource(width, height, nativeModel, pixels, 
                                 0, width);

Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- gnu/java/awt/peer/gtk/GtkToolkit.java       30 May 2006 22:36:32 -0000     
1.86
+++ gnu/java/awt/peer/gtk/GtkToolkit.java       5 Jun 2006 13:47:04 -0000      
1.87
@@ -184,6 +184,9 @@

   public Image createImage (ImageProducer producer) 
   {
+    if (producer == null)
+      return null;
+      
     Image image;
     try
       {


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=27507