Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39B4F1082F for ; Sun, 1 Feb 2015 16:14:51 +0000 (UTC) Received: (qmail 1826 invoked by uid 500); 1 Feb 2015 16:14:51 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 1792 invoked by uid 500); 1 Feb 2015 16:14:51 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 1782 invoked by uid 99); 1 Feb 2015 16:14:51 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 01 Feb 2015 16:14:51 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 8F7F1AC039B; Sun, 1 Feb 2015 16:14:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1656322 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image: JPEGFactory.java LosslessFactory.java Date: Sun, 01 Feb 2015 16:14:51 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150201161451.8F7F1AC039B@hades.apache.org> Author: tilman Date: Sun Feb 1 16:14:51 2015 New Revision: 1656322 URL: http://svn.apache.org/r1656322 Log: PDFBOX-2654: avoid NPE if bi.getAlphaRaster() returns null Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java?rev=1656322&r1=1656321&r2=1656322&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java Sun Feb 1 16:14:51 2015 @@ -181,6 +181,11 @@ public final class JPEGFactory extends I " useful, use LosslessImageFactory instead"); } WritableRaster alphaRaster = image.getAlphaRaster(); + if (alphaRaster == null) + { + // happens sometimes (PDFBOX-2654) despite colormodel claiming to have alpha + return null; + } BufferedImage alphaImage = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_BYTE_GRAY); alphaImage.setData(alphaRaster); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java?rev=1656322&r1=1656321&r2=1656322&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Sun Feb 1 16:14:51 2015 @@ -136,6 +136,11 @@ public class LosslessFactory // extract the alpha information WritableRaster alphaRaster = image.getAlphaRaster(); + if (alphaRaster == null) + { + // happens sometimes (PDFBOX-2654) despite colormodel claiming to have alpha + return null; + } int[] pixels = alphaRaster.getPixels(0, 0, alphaRaster.getSampleModel().getWidth(),