You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2014/01/13 18:55:55 UTC
svn commit: r1557794 - in /pdfbox/branches/1.8: ./
pdfbox/src/main/java/org/apache/pdfbox/util/ImageIOUtil.java
Author: lehmi
Date: Mon Jan 13 17:55:54 2014
New Revision: 1557794
URL: http://svn.apache.org/r1557794
Log:
PDFBOX-1799: avoid NPE based on a proposal by Puhong You
Modified:
pdfbox/branches/1.8/ (props changed)
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/ImageIOUtil.java
Propchange: pdfbox/branches/1.8/
------------------------------------------------------------------------------
Merged /pdfbox/trunk:r1557793
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/ImageIOUtil.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/ImageIOUtil.java?rev=1557794&r1=1557793&r2=1557794&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/ImageIOUtil.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/util/ImageIOUtil.java Mon Jan 13 17:55:54 2014
@@ -156,9 +156,12 @@ public class ImageIOUtil
writerParams.setCompressionQuality(quality);
}
IIOMetadata meta = createMetadata( image, imageWriter, writerParams, resolution);
- imageWriter.setOutput( output );
- imageWriter.write( null, new IIOImage( image, null, meta ), writerParams );
- foundWriter = true;
+ if (meta != null)
+ {
+ imageWriter.setOutput( output );
+ imageWriter.write( null, new IIOImage( image, null, meta ), writerParams );
+ foundWriter = true;
+ }
}
catch( IIOException io )
{
@@ -208,7 +211,7 @@ public class ImageIOUtil
private static boolean addResolution(IIOMetadata meta, int resolution)
{
- if (!meta.isReadOnly() && meta.isStandardMetadataFormatSupported())
+ if (meta != null && !meta.isReadOnly() && meta.isStandardMetadataFormatSupported())
{
IIOMetadataNode root = (IIOMetadataNode)meta.getAsTree(STANDARD_METADATA_FORMAT);
IIOMetadataNode dim = getChildNode(root, "Dimension");