svn commit: r1891448 - /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/StandardColorSpaceHelper.java

[ti...@apache.org]

Author: tilman
Date: Sun Jul 11 12:05:39 2021
New Revision: 1891448

URL: http://svn.apache.org/viewvc?rev=1891448&view=rev
Log:
PDFBOX-4892: optimize code, as suggested by valerybokov

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=1891448&r1=1891447&r2=1891448&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 Sun Jul 11 12:05:39 2021
@@ -251,10 +251,10 @@ public class StandardColorSpaceHelper im
                 // PDFBOX-2819: load ICC profile as a stream, not as a byte array because of java error
                 iccp = ICC_Profile.getInstance(is);
             }
-            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(
@@ -280,7 +280,7 @@ public class StandardColorSpaceHelper im
                 {
                     return;
                 }
-                validateICCProfileAlternateEntry(iccBased);
+                validateICCProfileAlternateEntry(iccBased, alternateColorSpace);
             }
         }
         catch (IllegalArgumentException | ArrayIndexOutOfBoundsException e)
@@ -543,16 +543,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() + ")"));
         }
     }
 }