Author: damjan
Date: Mon Oct 21 18:06:52 2013
New Revision: 1534297
URL: http://svn.apache.org/r1534297
Log:
Fix an NPE regression in TIFF image reading.
Jira issue key: IMAGING-113
Modified:
commons/proper/imaging/trunk/src/changes/changes.xml
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
Modified: commons/proper/imaging/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/changes/changes.xml?rev=1534297&r1=1534296&r2=1534297&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/changes/changes.xml (original)
+++ commons/proper/imaging/trunk/src/changes/changes.xml Mon Oct 21 18:06:52
2013
@@ -46,6 +46,9 @@ The <action> type attribute can be add,u
<body>
<release version="1.0" date="TBA" description="TBA">
+ <action issue="IMAGING-113" dev="damjan" type="fix">
+ Cannot read multipage tiff.
+ </action>
<action issue="IMAGING-108" dev="damjan" type="fix">
JPEG EOI marker could not be found at expected location.
</action>
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1534297&r1=1534296&r2=1534297&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
Mon Oct 21 18:06:52 2013
@@ -509,6 +509,9 @@ public class TiffImageParser extends Ima
final String key, final Map<String, Object>params)
throws ImageReadException
{
+ if (params == null) {
+ return null;
+ }
if(!params.containsKey(key)) {
return null;
