From commits-return-15211-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Thu Jul 25 16:54:38 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 7AB4918066C for ; Thu, 25 Jul 2019 18:54:38 +0200 (CEST) Received: (qmail 15846 invoked by uid 500); 25 Jul 2019 16:54:38 -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 15835 invoked by uid 99); 25 Jul 2019 16:54:37 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jul 2019 16:54:37 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5819B3A3876 for ; Thu, 25 Jul 2019 16:54:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1863750 - /pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Date: Thu, 25 Jul 2019 16:54:37 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190725165437.5819B3A3876@svn01-us-west.apache.org> Author: tilman Date: Thu Jul 25 16:54:37 2019 New Revision: 1863750 URL: http://svn.apache.org/viewvc?rev=1863750&view=rev Log: PDFBOX-4607: set correct /Alternate colorspace for images with gray colorspace, by Emmeran Seehuber Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java?rev=1863750&r1=1863749&r2=1863750&view=diff ============================================================================== --- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java (original) +++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Thu Jul 25 16:54:37 2019 @@ -562,8 +562,10 @@ public final class LosslessFactory ColorSpace srcCspace = image.getColorModel().getColorSpace(); int srcCspaceType = srcCspace.getType(); - PDColorSpace pdColorSpace = srcCspaceType != ColorSpace.TYPE_CMYK - ? PDDeviceRGB.INSTANCE : PDDeviceCMYK.INSTANCE; + PDColorSpace pdColorSpace = srcCspaceType == ColorSpace.TYPE_CMYK + ? PDDeviceCMYK.INSTANCE + : (srcCspaceType == ColorSpace.TYPE_GRAY + ? PDDeviceGray.INSTANCE : PDDeviceRGB.INSTANCE); // Encode the image profile if the image has one if (srcCspace instanceof ICC_ColorSpace)