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 2020/02/22 12:25:58 UTC

svn commit: r1874375 - /pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java

Author: tilman
Date: Sat Feb 22 12:25:58 2020
New Revision: 1874375

URL: http://svn.apache.org/viewvc?rev=1874375&view=rev
Log:
PDFBOX-4071: remove unneeded nullcheck; don't create instance and use the actual call instead to trigger exception

Modified:
    pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java

Modified: pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1874375&r1=1874374&r2=1874375&view=diff
==============================================================================
--- pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ pdfbox/branches/issue45/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Sat Feb 22 12:25:58 2020
@@ -152,7 +152,7 @@ public final class PDICCBased extends PD
         if (indirect != null && resources != null && resources.getResourceCache() != null)
         {
             PDColorSpace space = resources.getResourceCache().getColorSpace(indirect);
-            if (space != null && space instanceof PDICCBased)
+            if (space instanceof PDICCBased)
             {
                 return (PDICCBased) space;
             }
@@ -247,7 +247,7 @@ public final class PDICCBased extends PD
                     // or CMMException due to invalid profiles, see PDFBOX-1295 and PDFBOX-1740 (ü-file)
                     // or ArrayIndexOutOfBoundsException, see PDFBOX-3610
                     // also triggers a ProfileDataException for PDFBOX-3549 with KCMS
-                    new Color(awtColorSpace, new float[getNumberOfComponents()], 1f);
+                    awtColorSpace.toRGB(new float[getNumberOfComponents()]);
                 }
                 else
                 {