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 64E97CF07 for ; Fri, 19 Dec 2014 08:24:55 +0000 (UTC) Received: (qmail 87881 invoked by uid 500); 19 Dec 2014 08:24:55 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 87858 invoked by uid 500); 19 Dec 2014 08:24: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 87848 invoked by uid 99); 19 Dec 2014 08:24:55 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Dec 2014 08:24:55 +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 759C5AC094D; Fri, 19 Dec 2014 08:24:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1646650 - in /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic: DeviceColorSpaceHelper.java NoPatternColorSpaceHelper.java StandardColorSpaceHelper.java Date: Fri, 19 Dec 2014 08:24:53 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141219082454.759C5AC094D@hades.apache.org> Author: tilman Date: Fri Dec 19 08:24:53 2014 New Revision: 1646650 URL: http://svn.apache.org/r1646650 Log: PDFBOX-2576: ICC_Profile.getInstance is never null; add @override where needed Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/NoPatternColorSpaceHelper.java pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java?rev=1646650&r1=1646649&r2=1646650&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/DeviceColorSpaceHelper.java Fri Dec 19 08:24:53 2014 @@ -45,6 +45,7 @@ public class DeviceColorSpaceHelper exte * This method updates the given list with a ValidationError (ERROR_GRAPHIC_INVALID_PATTERN_COLOR_SPACE_FORBIDDEN) * and returns false. */ + @Override protected void processPatternColorSpace(PDColorSpace pdcs) { context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_FORBIDDEN, @@ -55,6 +56,7 @@ public class DeviceColorSpaceHelper exte * This method updates the given list with a ValidationError (ERROR_GRAPHIC_INVALID_PATTERN_COLOR_SPACE_FORBIDDEN) * and returns false. */ + @Override protected void processDeviceNColorSpace(PDColorSpace pdcs) { context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_FORBIDDEN, @@ -66,6 +68,7 @@ public class DeviceColorSpaceHelper exte * given list is updated with a ValidationError (ERROR_GRAPHIC_INVALID_PATTERN_COLOR_SPACE_FORBIDDEN) and returns * false. */ + @Override protected void processIndexedColorSpace(PDColorSpace pdcs) { PDIndexed indexed = (PDIndexed) pdcs; Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/NoPatternColorSpaceHelper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/NoPatternColorSpaceHelper.java?rev=1646650&r1=1646649&r2=1646650&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/NoPatternColorSpaceHelper.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/NoPatternColorSpaceHelper.java Fri Dec 19 08:24:53 2014 @@ -43,6 +43,7 @@ public class NoPatternColorSpaceHelper e * This method updates the given list with a ValidationError (ERROR_GRAPHIC_INVALID_PATTERN_COLOR_SPACE_FORBIDDEN) * and returns false. */ + @Override protected void processPatternColorSpace(PDColorSpace pdcs) { context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_PATTERN_COLOR_SPACE_FORBIDDEN, Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1646650&r1=1646649&r2=1646650&view=diff ============================================================================== --- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java (original) +++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Fri Dec 19 08:24:53 2014 @@ -35,7 +35,6 @@ import static org.apache.pdfbox.prefligh import java.awt.color.ICC_Profile; import java.io.IOException; -import java.util.List; import java.util.Map; import org.apache.pdfbox.cos.COSArray; @@ -82,6 +81,7 @@ public class StandardColorSpaceHelper im * * @see net.awl.edoc.pdfa.validation.graphics.color.ColorSpaceHelper#validate(java .util.List) */ + @Override public final void validate() throws ValidationException { if (pdcs == null) @@ -232,13 +232,7 @@ public class StandardColorSpaceHelper im PDICCBased iccBased = (PDICCBased) pdcs; try { - ICC_Profile iccp = ICC_Profile.getInstance(iccBased.getPDStream().getByteArray()); - if (iccp == null) - { - context.addValidationError(new ValidationError(ERROR_GRAPHIC_INVALID_COLOR_SPACE_ICCBASED, - "Unable to read ICCBase color space ")); - return; - } + ICC_Profile.getInstance(iccBased.getPDStream().getByteArray()); PDColorSpace altpdcs = iccBased.getAlternateColorSpace(); if (altpdcs != null) {