You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/08/11 19:20:48 UTC
svn commit: r1617331 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
Author: tilman
Date: Mon Aug 11 17:20:48 2014
New Revision: 1617331
URL: http://svn.apache.org/r1617331
Log:
PDFBOX-2267: treat /Alternate as ONE colorspace
Modified:
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/StandardColorSpaceHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1617331&r1=1617330&r2=1617331&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 Mon Aug 11 17:20:48 2014
@@ -242,30 +242,25 @@ public class StandardColorSpaceHelper im
"Unable to read ICCBase color space "));
return;
}
- List<PDColorSpace> altCs = iccBased.getAlternateColorSpaces();
- for (PDColorSpace altpdcs : altCs)
+ PDColorSpace altpdcs = iccBased.getAlternateColorSpace();
+ if (altpdcs != null)
{
- if (altpdcs != null)
+ ColorSpaces altCsId = ColorSpaces.valueOf(altpdcs.getName());
+ if (altCsId == ColorSpaces.Pattern)
{
-
- ColorSpaces altCsId = ColorSpaces.valueOf(altpdcs.getName());
- if (altCsId == ColorSpaces.Pattern)
- {
- context.addValidationError(new ValidationError(
- ERROR_GRAPHIC_INVALID_PATTERN_COLOR_SPACE_FORBIDDEN,
- "Pattern is forbidden as AlternateColorSpace of a ICCBased"));
- return;
- }
-
- /*
- * According to the ISO-19005-1:2005
- *
- * A conforming reader shall render ICCBased colour spaces as specified by the ICC specification,
- * and shall not use the Alternate colour space specified in an ICC profile stream dictionary
- *
- * We don't check the alternate ColorSpaces
- */
+ context.addValidationError(new ValidationError(
+ ERROR_GRAPHIC_INVALID_PATTERN_COLOR_SPACE_FORBIDDEN,
+ "Pattern is forbidden as AlternateColorSpace of a ICCBased"));
}
+
+ /*
+ * According to the ISO-19005-1:2005
+ *
+ * A conforming reader shall render ICCBased colour spaces as specified by the ICC specification,
+ * and shall not use the Alternate colour space specified in an ICC profile stream dictionary
+ *
+ * We don't check the alternate ColorSpaces
+ */
}
}
catch (IllegalArgumentException e)