You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/02/01 17:03:37 UTC
svn commit: r1656321 -
/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
Author: tilman
Date: Sun Feb 1 16:03:37 2015
New Revision: 1656321
URL: http://svn.apache.org/r1656321
Log:
PDFBOX-2654: avoid NPE if bi.getAlphaRaster() returns null
Modified:
pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java?rev=1656321&r1=1656320&r2=1656321&view=diff
==============================================================================
--- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java (original)
+++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/xobject/PDXObjectImage.java Sun Feb 1 16:03:37 2015
@@ -496,6 +496,11 @@ public abstract class PDXObjectImage ext
BufferedImage extractAlphaImage(BufferedImage bi)
{
WritableRaster alphaRaster = bi.getAlphaRaster();
+ if (alphaRaster == null)
+ {
+ // happens sometimes (PDFBOX-2654) despite colormodel claiming to have alpha
+ return null;
+ }
BufferedImage alphaImage = new BufferedImage(alphaRaster.getWidth(),
alphaRaster.getHeight(),
bi.getTransparency() == Transparency.BITMASK ?