[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: small GdkGraphics2D fix

[Kaffe CVS]

PatchSet 5519 
Date: 2004/12/03 14:00:18
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: small GdkGraphics2D fix
2004-12-03  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:
        Resynced with GNU Classpath.

        2004-11-26  Sven de Marothy  <sven at physto.se>

        * gnu/java/awt/peer/gtk/GdkGraphics2D.java
        (drawRaster): Set alpha component to opaque if image has no alpha

Members: 
	ChangeLog:1.3065->1.3066 
	libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3065 kaffe/ChangeLog:1.3066
--- kaffe/ChangeLog:1.3065	Fri Dec  3 13:37:43 2004
+++ kaffe/ChangeLog	Fri Dec  3 14:00:18 2004
@@ -1,5 +1,15 @@
 2004-12-03  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:
+        Resynced with GNU Classpath.
+
+	2004-11-26  Sven de Marothy  <sven at physto.se>
+
+        * gnu/java/awt/peer/gtk/GdkGraphics2D.java
+        (drawRaster): Set alpha component to opaque if image has no alpha
+	
+2004-12-03  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/io/File.java,
 	libraries/javalib/java/io/VMFile.java:
         Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java
diff -u kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.8 kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.9
--- kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java:1.8	Sun Nov 14 22:14:41 2004
+++ kaffe/libraries/javalib/gnu/java/awt/peer/gtk/GdkGraphics2D.java	Fri Dec  3 14:00:21 2004
@@ -1066,14 +1066,17 @@
     // change all transparent pixels in the image to the 
     // specified bgcolor
             
-    if (bgcolor != null) 
+    if (cm.hasAlpha()) 
       {
+        if (bgcolor != null) 
+          for (int i = 0; i < pixels.length; i++) 
+            {
+              if (cm.getAlpha (pixels[i]) == 0) 
+                pixels[i] = bgcolor.getRGB ();	    
+            }
+      } else 
         for (int i = 0; i < pixels.length; i++) 
-          {
-            if (cm.getAlpha (pixels[i]) == 0) 
-              pixels[i] = bgcolor.getRGB ();	    
-          }
-      } 
+	  pixels[i] |= 0xFF000000;
 
     drawPixels (pixels, r.getWidth (), r.getHeight (), r.getWidth (), i2u);