incubator-sanselan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmc...@apache.org
Subject svn commit: r790019 - in /incubator/sanselan/trunk: RELEASE_NOTES src/main/java/org/apache/sanselan/Sanselan.java
Date Wed, 01 Jul 2009 01:46:38 GMT
Author: cmchen
Date: Wed Jul  1 01:46:37 2009
New Revision: 790019

URL: http://svn.apache.org/viewvc?rev=790019&view=rev
Log:
* Fixed a possible NPE in Sanselan.getICCProfile pointed out by Jon Weygandt.

Modified:
    incubator/sanselan/trunk/RELEASE_NOTES
    incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java

Modified: incubator/sanselan/trunk/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/RELEASE_NOTES?rev=790019&r1=790018&r2=790019&view=diff
==============================================================================
--- incubator/sanselan/trunk/RELEASE_NOTES (original)
+++ incubator/sanselan/trunk/RELEASE_NOTES Wed Jul  1 01:46:37 2009
@@ -14,6 +14,7 @@
 
 Next Release
 ------------
+ * Fixed a possible NPE in Sanselan.getICCProfile pointed out by Jon Weygandt.
  * Fixed a bug in which gifs have incorrect size information in the the Logical Screen Descriptor.
    This appears to be a bug in how Microsoft Office writes gifs.
    The Image Descriptor has the correct value.

Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java?rev=790019&r1=790018&r2=790019&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java Wed Jul  1 01:46:37
2009
@@ -320,6 +320,8 @@
 
 		IccProfileParser parser = new IccProfileParser();
 		IccProfileInfo info = parser.getICCProfileInfo(bytes);
+		if (info == null)
+			return null;
 		if (info.issRGB())
 			return null;
 



Mime
View raw message