From commits-return-12840-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Sun Jul 22 10:03:29 2018 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 [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0DB5418062F for ; Sun, 22 Jul 2018 10:03:28 +0200 (CEST) Received: (qmail 36455 invoked by uid 500); 22 Jul 2018 08:03:28 -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 36446 invoked by uid 99); 22 Jul 2018 08:03:28 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2018 08:03:28 +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 69A523A018A for ; Sun, 22 Jul 2018 08:03:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1836424 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java Date: Sun, 22 Jul 2018 08:03:26 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180722080327.69A523A018A@svn01-us-west.apache.org> Author: tilman Date: Sun Jul 22 08:03:26 2018 New Revision: 1836424 URL: http://svn.apache.org/viewvc?rev=1836424&view=rev Log: PDFBOX-4184: compare sizes of different strategies for small non 16 bit images Modified: 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/LosslessFactory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/LosslessFactory.java?rev=1836424&r1=1836423&r2=1836424&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 Jul 22 08:03:26 2018 @@ -83,6 +83,22 @@ public final class LosslessFactory PDImageXObject pdImageXObject = new PredictorEncoder(document, image).encode(); if (pdImageXObject != null) { + if (pdImageXObject.getBitsPerComponent() < 16 && + image.getWidth() * image.getHeight() <= 50 * 50) + { + // also create classic compressed image, compare sizes + PDImageXObject pdImageXObjectClassic = createFromRGBImage(image, document); + if (pdImageXObjectClassic.getCOSObject().getLength() < + pdImageXObject.getCOSObject().getLength()) + { + pdImageXObject.getCOSObject().close(); + return pdImageXObjectClassic; + } + else + { + pdImageXObjectClassic.getCOSObject().close(); + } + } return pdImageXObject; } }