[vassalengine-svn] SF.net SVN: vassalengine:[7429] VASSAL-src/branches/3.1

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

Revision: 7429
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7429&view=rev
Author:   uckelman
Date:     2010-10-26 22:29:49 +0000 (Tue, 26 Oct 2010)

Log Message:
-----------
Fixed Bug 3095: JPEGs with bad color profiles throw CMMException

Modified Paths:
--------------
    VASSAL-src/branches/3.1/NOTES
    VASSAL-src/branches/3.1/src/VASSAL/tools/image/ImageLoader.java

Modified: VASSAL-src/branches/3.1/NOTES
===================================================================
--- VASSAL-src/branches/3.1/NOTES	2010-10-26 22:20:33 UTC (rev 7428)
+++ VASSAL-src/branches/3.1/NOTES	2010-10-26 22:29:49 UTC (rev 7429)
@@ -39,6 +39,7 @@
 
 The following bugs are fixed in 3.1.15:
 
+* Bug 3095: JPEGs with bad color profiles throw CMMException
 * Bug 2924: Mac OS X: Quartz renderer misrenders fonts
 * Bug 2883: MemoryUtilsImpl is misnamed
 * Bug: ADC2 line definition names are max 25 chars long

Modified: VASSAL-src/branches/3.1/src/VASSAL/tools/image/ImageLoader.java
===================================================================
--- VASSAL-src/branches/3.1/src/VASSAL/tools/image/ImageLoader.java	2010-10-26 22:20:33 UTC (rev 7428)
+++ VASSAL-src/branches/3.1/src/VASSAL/tools/image/ImageLoader.java	2010-10-26 22:29:49 UTC (rev 7429)
@@ -291,6 +291,17 @@
         try {
           size = new Dimension(reader.getWidth(0), reader.getHeight(0));
         }
+        catch (CMMException e) {
+          // Note: ImageIO can throw a CMMException for JPEGs which have
+          // broken color profiles. This problem is noted in Sun Bugs 6444360
+          // and 6839133.
+          //
+          // http://bugs.sun.com/view_bug.do?bug_id=6444360
+          // http://bugs.sun.com/view_bug.do?bug_id=6839133
+          //
+          ErrorDialog.dataError(new BadDataReport("Broken image", name));
+          throw (IOException) new IOException().initCause(e);
+        }
         catch (IllegalArgumentException e) {
           // Note: ImageIO can throw IllegalArgumentExceptions for certain
           // kinds of broken images, e.g., JPEGs which are in the RGB color


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