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 2018/07/26 19:09:57 UTC
svn commit: r1836752 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java
Author: tilman
Date: Thu Jul 26 19:09:57 2018
New Revision: 1836752
URL: http://svn.apache.org/viewvc?rev=1836752&view=rev
Log:
PDFBOX-4279: avoid NPE with empty annotation color that have no colorspace
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java?rev=1836752&r1=1836751&r2=1836752&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java Thu Jul 26 19:09:57 2018
@@ -113,9 +113,11 @@ public final class PDColor
*/
public float[] getComponents()
{
- if (colorSpace instanceof PDPattern)
+ if (colorSpace instanceof PDPattern || colorSpace == null)
{
// colorspace of the pattern color isn't known, so just clone
+ // null colorspace can happen with empty annotation color
+ // see PDFBOX-3351-538928-p4.pdf
return components.clone();
}
// PDFBOX-4279: copyOf instead of clone in case array is too small
@@ -184,7 +186,6 @@ public final class PDColor
@Override
public String toString()
{
- return "PDColor{components=" + Arrays.toString(components) +
- ", patternName=" + patternName + "}";
+ return "PDColor{components=" + Arrays.toString(components) + ", patternName=" + patternName + ", colorSpace=" + colorSpace + '}';
}
}