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 2021/07/11 12:05:43 UTC
svn commit: r1891449 -
/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
Author: tilman
Date: Sun Jul 11 12:05:43 2021
New Revision: 1891449
URL: http://svn.apache.org/viewvc?rev=1891449&view=rev
Log:
PDFBOX-4892: optimize code, as suggested by valerybokov
Modified:
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java?rev=1891449&r1=1891448&r2=1891449&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java Sun Jul 11 12:05:43 2021
@@ -248,10 +248,10 @@ public class StandardColorSpaceHelper im
// PDFBOX-2819: load ICC profile as a stream, not as a byte array because of java error
ICC_Profile iccp = ICC_Profile.getInstance(is);
is.close();
- PDColorSpace altpdcs = iccBased.getAlternateColorSpace();
- if (altpdcs != null)
+ PDColorSpace alternateColorSpace = iccBased.getAlternateColorSpace();
+ if (alternateColorSpace != null)
{
- ColorSpaces altCsId = ColorSpaces.valueOf(altpdcs.getName());
+ ColorSpaces altCsId = ColorSpaces.valueOf(alternateColorSpace.getName());
if (altCsId == ColorSpaces.Pattern)
{
context.addValidationError(new ValidationError(
@@ -277,7 +277,7 @@ public class StandardColorSpaceHelper im
{
return;
}
- validateICCProfileAlternateEntry(iccBased);
+ validateICCProfileAlternateEntry(iccBased, alternateColorSpace);
}
}
catch (IllegalArgumentException e)
@@ -550,16 +550,16 @@ public class StandardColorSpaceHelper im
return true;
}
- private void validateICCProfileAlternateEntry(PDICCBased iccBased) throws IOException
+ private void validateICCProfileAlternateEntry(
+ PDICCBased iccBased, PDColorSpace alternateColorSpace) throws IOException
{
- PDColorSpace altCS = iccBased.getAlternateColorSpace();
- if (altCS != null && altCS.getNumberOfComponents() != iccBased.getNumberOfComponents())
+ if (alternateColorSpace.getNumberOfComponents() != iccBased.getNumberOfComponents())
{
// https://github.com/veraPDF/veraPDF-library/issues/773
context.addValidationError(new ValidationError(ERROR_GRAPHIC_OUTPUT_INTENT_INVALID_ENTRY,
"/N entry of ICC profile is different (" + iccBased.getNumberOfComponents()
+ ") than alternate entry colorspace component count ("
- + altCS.getNumberOfComponents() + ")"));
+ + alternateColorSpace.getNumberOfComponents() + ")"));
}
}
}