From commits-return-15926-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Wed Oct 23 03:50:56 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E2E4618062C for ; Wed, 23 Oct 2019 05:50:55 +0200 (CEST) Received: (qmail 48377 invoked by uid 500); 23 Oct 2019 03:50:55 -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 48368 invoked by uid 99); 23 Oct 2019 03:50:55 -0000 Received: from Unknown (HELO svn01-us-east.apache.org) (13.90.137.153) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Oct 2019 03:50:55 +0000 Received: from svn01-us-east.apache.org (localhost [127.0.0.1]) by svn01-us-east.apache.org (ASF Mail Server at svn01-us-east.apache.org) with ESMTP id 13EA817D00E for ; Wed, 23 Oct 2019 03:50:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1868779 - /pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Date: Wed, 23 Oct 2019 03:50:55 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20191023035055.13EA817D00E@svn01-us-east.apache.org> Author: tilman Date: Wed Oct 23 03:50:54 2019 New Revision: 1868779 URL: http://svn.apache.org/viewvc?rev=1868779&view=rev Log: PDFBOX-4672: check transparency too, because our "fast path" createFromGrayImage() doesn't handle them Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java?rev=1868779&r1=1868778&r2=1868779&view=diff ============================================================================== --- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java (original) +++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Wed Oct 23 03:50:54 2019 @@ -79,8 +79,9 @@ public final class LosslessFactory public static PDImageXObject createFromImage(PDDocument document, BufferedImage image) throws IOException { - if ((image.getType() == BufferedImage.TYPE_BYTE_GRAY && image.getColorModel().getPixelSize() <= 8) - || (image.getType() == BufferedImage.TYPE_BYTE_BINARY && image.getColorModel().getPixelSize() == 1)) + if (image.getTransparency() == BufferedImage.OPAQUE && + ((image.getType() == BufferedImage.TYPE_BYTE_GRAY && image.getColorModel().getPixelSize() <= 8) + || (image.getType() == BufferedImage.TYPE_BYTE_BINARY && image.getColorModel().getPixelSize() == 1))) { return createFromGrayImage(image, document); }