From commits-return-11615-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Fri Jan 19 16:30:30 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id EA2D1180607 for ; Fri, 19 Jan 2018 16:30:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DA393160C28; Fri, 19 Jan 2018 15:30:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2A6E2160C27 for ; Fri, 19 Jan 2018 16:30:30 +0100 (CET) Received: (qmail 21770 invoked by uid 500); 19 Jan 2018 15:30:29 -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 21761 invoked by uid 99); 19 Jan 2018 15:30:29 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jan 2018 15:30:29 +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 D98D53A0118 for ; Fri, 19 Jan 2018 15:30:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1821666 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java Date: Fri, 19 Jan 2018 15:30:25 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180119153027.D98D53A0118@svn01-us-west.apache.org> Author: tilman Date: Fri Jan 19 15:30:25 2018 New Revision: 1821666 URL: http://svn.apache.org/viewvc?rev=1821666&view=rev Log: PDFBOX-3353: color is for border, not background; remove opacity TODO because link annotation isn't a markup annotation Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java?rev=1821666&r1=1821665&r2=1821666&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java Fri Jan 19 15:30:25 2018 @@ -52,6 +52,14 @@ public class PDLinkAppearanceHandler ext @Override public void generateNormalAppearance() { + PDAnnotationLink annotation = (PDAnnotationLink) getAnnotation(); + if (annotation.getRectangle() == null) + { + // 660402-p1-AnnotationEmptyRect.pdf has /Rect entry with 0 elements + //TODO check for qzadpoints before quitting + return; + } + // Adobe doesn't generate an appearance for a link annotation float lineWidth = getLineWidth(); try @@ -59,11 +67,8 @@ public class PDLinkAppearanceHandler ext try (PDAppearanceContentStream contentStream = getNormalAppearanceAsContentStream()) { contentStream.setStrokingColorOnDemand(getColor()); - boolean hasBackground = contentStream.setNonStrokingColorOnDemand(getAnnotation().getColor()); - - // TODO: handle opacity settings - - contentStream.setBorderLine(lineWidth, ((PDAnnotationLink) getAnnotation()).getBorderStyle()); + + contentStream.setBorderLine(lineWidth, annotation.getBorderStyle()); // the differences rectangle // TODO: this only works for border effect solid. Cloudy needs a different approach. @@ -75,7 +80,7 @@ public class PDLinkAppearanceHandler ext contentStream.addRect(borderEdge.getLowerLeftX() , borderEdge.getLowerLeftY(), borderEdge.getWidth(), borderEdge.getHeight()); - contentStream.drawShape(lineWidth, hasBackground); + contentStream.drawShape(lineWidth, false); } } catch (IOException e)