You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2012/05/15 09:50:23 UTC
svn commit: r1338576 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Author: lehmi
Date: Tue May 15 07:50:23 2012
New Revision: 1338576
URL: http://svn.apache.org/viewvc?rev=1338576&view=rev
Log:
PDFBOX-1295: use an alternate colorspace if the ICC_Profile can't be read for any reason
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1338576&r1=1338575&r2=1338576&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Tue May 15 07:50:23 2012
@@ -28,8 +28,8 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.pdmodel.common.COSArrayList;
import org.apache.pdfbox.pdmodel.common.PDRange;
import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.apache.pdfbox.util.operator.pagedrawer.Invoke;
+import java.awt.Color;
import java.awt.Transparency;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
@@ -141,24 +141,19 @@ public class PDICCBased extends PDColorS
profile = stream.createInputStream();
ICC_Profile iccProfile = ICC_Profile.getInstance( profile );
cSpace = new ICC_ColorSpace( iccProfile );
- }
- catch(IllegalArgumentException excpetion)
- {
- LOG.debug("Can't read ICC-profile, using alterbnate colorspace instead");
- List colorspacesList = getAlternateColorSpaces();
- if (colorspacesList != null && colorspacesList.size() > 0)
- {
- Object[] colorspaces = colorspacesList.toArray();
- int numOfComponents = getNumberOfComponents();
- for (int i=0;i<colorspaces.length;i++)
- {
- if (numberOfComponents == ((PDColorSpace)colorspaces[i]).getNumberOfComponents())
- {
- cSpace = ((PDColorSpace)colorspaces[i]).createColorSpace();
- break;
- }
- }
- }
+ float[] components = new float[numberOfComponents];
+ // there maybe a ProfileDataException or a CMMException as there
+ // are some issues when loading ICC_Profiles, see PDFBOX-1295
+ // Try to create a color as test ...
+ new Color(cSpace,components,1f);
+ }
+ catch (RuntimeException e)
+ {
+ // we are using an alternate colorspace as fallback
+ LOG.debug("Can't read ICC-profile, using alternate colorspace instead");
+ List alternateCSList = getAlternateColorSpaces();
+ PDColorSpace alternate = (PDColorSpace)alternateCSList.get(0);
+ cSpace = alternate.getJavaColorSpace();
}
finally
{