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

[ti...@apache.org]

Author: tilman
Date: Thu Nov 16 17:03:38 2017
New Revision: 1815487

URL: http://svn.apache.org/viewvc?rev=1815487&view=rev
Log:
PDFBOX-4015: early trigger of "CMMException: LCMS error 13" with LCMS; sort imports; fix typos

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

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1815487&r1=1815486&r2=1815487&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Thu Nov 16 17:03:38 2017
@@ -17,8 +17,20 @@
 package org.apache.pdfbox.pdmodel.graphics.color;
 
 import java.awt.Color;
+import java.awt.Transparency;
+import java.awt.color.CMMException;
 import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.awt.color.ProfileDataException;
+import java.awt.image.BufferedImage;
+import java.awt.image.ComponentColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.WritableRaster;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
+import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pdfbox.cos.COSArray;
@@ -26,28 +38,15 @@ import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSFloat;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSStream;
-
 import org.apache.pdfbox.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.common.COSArrayList;
 import org.apache.pdfbox.pdmodel.common.PDRange;
 import org.apache.pdfbox.pdmodel.common.PDStream;
-
-import java.awt.color.CMMException;
-import java.awt.color.ICC_ColorSpace;
-import java.awt.color.ICC_Profile;
-import java.awt.color.ProfileDataException;
-import java.awt.image.BufferedImage;
-
-import java.awt.image.WritableRaster;
-import java.io.InputStream;
-import java.io.IOException;
-
-import java.util.List;
 import org.apache.pdfbox.util.Charsets;
 
 /**
- * ICCBased colour spaces are based on a cross-platform colour profile as defined by the
+ * ICCBased color spaces are based on a cross-platform color profile as defined by the
  * International Color Consortium (ICC).
  *
  * @author Ben Litchfield
@@ -156,6 +155,9 @@ public final class PDICCBased extends PD
                 awtColorSpace.toRGB(new float[awtColorSpace.getNumComponents()]);
                 // this one triggers an exception for PDFBOX-3549 with KCMS
                 new Color(awtColorSpace, new float[getNumberOfComponents()], 1f);
+                // PDFBOX-4015: this one triggers "CMMException: LCMS error 13" with LCMS
+                new ComponentColorModel(awtColorSpace, false, false, 
+                                        Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
             }
         }
         catch (RuntimeException e)