[vassalengine-svn] SF.net SVN: vassalengine:[5430] VASSAL-src/trunk/src/VASSAL/tools/image/ ImageUtils.java

[<uck...@us...>]

Revision: 5430
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5430&view=rev
Author:   uckelman
Date:     2009-03-31 21:14:07 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
Merged 3.1@5376.
Fixed Bug: 8-bit PNGs with 1-bit alpha have bad transparency
* Must force Toolkit Images to load before checking width, height.

Modified Paths:
--------------
    VASSAL-src/trunk/src/VASSAL/tools/image/ImageUtils.java

Modified: VASSAL-src/trunk/src/VASSAL/tools/image/ImageUtils.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/tools/image/ImageUtils.java	2009-03-31 21:07:38 UTC (rev 5429)
+++ VASSAL-src/trunk/src/VASSAL/tools/image/ImageUtils.java	2009-03-31 21:14:07 UTC (rev 5430)
@@ -441,8 +441,12 @@
       if (useToolkit) {
         rin.mark(4096);
 
-        final Image i =
-          Toolkit.getDefaultToolkit().createImage(IOUtils.toByteArray(rin));
+        // Load the Image; note that we forceLoad() to ensure that the
+        // subsequent calls to getWidth() and getHeight() return the
+        // actual width and height of the Image.
+        final Image i = forceLoad(
+          Toolkit.getDefaultToolkit().createImage(IOUtils.toByteArray(rin))
+        );
 
         // check that we received a valid Image from the Toolkit 
         if (i.getWidth(null) > 0 && i.getHeight(null) > 0) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.