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 2015/05/25 22:17:47 UTC
svn commit: r1681649 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Author: tilman
Date: Mon May 25 20:17:47 2015
New Revision: 1681649
URL: http://svn.apache.org/r1681649
Log:
PDFBOX-2812: avoid potiential later NPE by assigning local field
PDFBOX-2576: make field final; improve message
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=1681649&r1=1681648&r2=1681649&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 May 25 20:17:47 2015
@@ -57,7 +57,7 @@ public final class PDICCBased extends PD
{
private static final Log LOG = LogFactory.getLog(PDICCBased.class);
- private PDStream stream;
+ private final PDStream stream;
private int numberOfComponents = -1;
private ICC_Profile iccProfile;
private PDColorSpace alternateColorSpace;
@@ -72,7 +72,8 @@ public final class PDICCBased extends PD
{
array = new COSArray();
array.add(COSName.ICCBASED);
- array.add(new PDStream(doc));
+ stream = new PDStream(doc);
+ array.add(stream);
}
/**
@@ -148,7 +149,7 @@ public final class PDICCBased extends PD
// fall back to alternateColorSpace color space
awtColorSpace = null;
alternateColorSpace = getAlternateColorSpace();
- LOG.error("Can't read embedded ICC profile, using alternate color space: " + alternateColorSpace.getName());
+ LOG.error("Can't read embedded ICC profile (" + e.getLocalizedMessage() + "), using alternate color space: " + alternateColorSpace.getName());
initialColor = alternateColorSpace.getInitialColor();
}
else