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 2014/08/11 19:18:31 UTC
svn commit: r1617330 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Author: tilman
Date: Mon Aug 11 17:18:31 2014
New Revision: 1617330
URL: http://svn.apache.org/r1617330
Log:
PDFBOX-2267: treat /Alternate as ONE colorspace
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=1617330&r1=1617329&r2=1617330&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 Mon Aug 11 17:18:31 2014
@@ -128,9 +128,9 @@ public final class PDICCBased extends PD
e instanceof IllegalArgumentException)
{
// fall back to alternateColorSpace color space
- LOG.error("Can't read embedded ICC profile, using alternate color space");
awtColorSpace = null;
- alternateColorSpace = getAlternateColorSpaces().get(0);
+ alternateColorSpace = getAlternateColorSpace();
+ LOG.error("Can't read embedded ICC profile, using alternate color space: " + alternateColorSpace.getName());
initialColor = alternateColorSpace.getInitialColor();
}
else
@@ -213,7 +213,7 @@ public final class PDICCBased extends PD
* @return A list of alternateColorSpace color spaces.
* @throws IOException If there is an error getting the alternateColorSpace color spaces.
*/
- public List<PDColorSpace> getAlternateColorSpaces() throws IOException
+ public PDColorSpace getAlternateColorSpace() throws IOException
{
COSBase alternate = stream.getStream().getDictionaryObject(COSName.ALTERNATE);
COSArray alternateArray;
@@ -257,12 +257,7 @@ public final class PDICCBased extends PD
alternate.getClass().getName());
}
}
- List<PDColorSpace> list = new ArrayList<PDColorSpace>();
- for(int i=0; i<alternateArray.size(); i++)
- {
- list.add(PDColorSpace.create(alternateArray.get(i)));
- }
- return list;
+ return PDColorSpace.create(alternateArray);
}
/**