You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/07/09 10:38:02 UTC
svn commit: r1690025 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
Author: jahewson
Date: Thu Jul 9 08:38:02 2015
New Revision: 1690025
URL: http://svn.apache.org/r1690025
Log:
PDFBOX-2370: Handle direct resource objects
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java?rev=1690025&r1=1690024&r2=1690025&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java Thu Jul 9 08:38:02 2015
@@ -105,7 +105,7 @@ public final class PDResources implement
public PDFont getFont(COSName name) throws IOException
{
COSObject indirect = getIndirect(COSName.FONT, name);
- if (cache != null)
+ if (cache != null && indirect != null)
{
PDFont cached = cache.getFont(indirect);
if (cached != null)
@@ -137,7 +137,7 @@ public final class PDResources implement
public PDColorSpace getColorSpace(COSName name) throws IOException
{
COSObject indirect = getIndirect(COSName.FONT, name);
- if (cache != null)
+ if (cache != null && indirect != null)
{
PDColorSpace cached = cache.getColorSpace(indirect);
if (cached != null)
@@ -184,7 +184,7 @@ public final class PDResources implement
public PDExtendedGraphicsState getExtGState(COSName name)
{
COSObject indirect = getIndirect(COSName.FONT, name);
- if (cache != null)
+ if (cache != null && indirect != null)
{
PDExtendedGraphicsState cached = cache.getExtGState(indirect);
if (cached != null)
@@ -217,7 +217,7 @@ public final class PDResources implement
public PDShading getShading(COSName name) throws IOException
{
COSObject indirect = getIndirect(COSName.FONT, name);
- if (cache != null)
+ if (cache != null && indirect != null)
{
PDShading cached = cache.getShading(indirect);
if (cached != null)
@@ -250,7 +250,7 @@ public final class PDResources implement
public PDAbstractPattern getPattern(COSName name) throws IOException
{
COSObject indirect = getIndirect(COSName.FONT, name);
- if (cache != null)
+ if (cache != null && indirect != null)
{
PDAbstractPattern cached = cache.getPattern(indirect);
if (cached != null)
@@ -282,7 +282,7 @@ public final class PDResources implement
public PDPropertyList getProperties(COSName name)
{
COSObject indirect = getIndirect(COSName.FONT, name);
- if (cache != null)
+ if (cache != null && indirect != null)
{
PDPropertyList cached = cache.getProperties(indirect);
if (cached != null)
@@ -315,7 +315,7 @@ public final class PDResources implement
public PDXObject getXObject(COSName name) throws IOException
{
COSObject indirect = getIndirect(COSName.FONT, name);
- if (cache != null)
+ if (cache != null && indirect != null)
{
PDXObject cached = cache.getXObject(indirect);
if (cached != null)
@@ -357,7 +357,12 @@ public final class PDResources implement
{
return null;
}
- return (COSObject)dict.getItem(name);
+ COSBase base = dict.getItem(name);
+ if (base instanceof COSObject)
+ {
+ return (COSObject)base;
+ }
+ return null;
}
/**