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 2021/05/16 06:14:33 UTC
svn commit: r1889923 -
/pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
Author: tilman
Date: Sun May 16 06:14:33 2021
New Revision: 1889923
URL: http://svn.apache.org/viewvc?rev=1889923&view=rev
Log:
PDFBOX-5193: avoid NPE
Modified:
pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
Modified: pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java?rev=1889923&r1=1889922&r2=1889923&view=diff
==============================================================================
--- pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java (original)
+++ pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java Sun May 16 06:14:33 2021
@@ -822,16 +822,14 @@ public class PDFDebugger extends JFrame
{
Object underneathObject = getUnderneathObject(obj);
return underneathObject instanceof COSDictionary &&
- ((COSDictionary) underneathObject).containsKey(COSName.TYPE) &&
- ((COSDictionary) underneathObject).getCOSName(COSName.TYPE).equals(COSName.FONT_DESC);
+ COSName.FONT_DESC.equals(((COSDictionary) underneathObject).getCOSName(COSName.TYPE));
}
private boolean isAnnot(Object obj)
{
Object underneathObject = getUnderneathObject(obj);
return underneathObject instanceof COSDictionary &&
- ((COSDictionary) underneathObject).containsKey(COSName.TYPE) &&
- ((COSDictionary) underneathObject).getCOSName(COSName.TYPE).equals(COSName.ANNOT);
+ COSName.ANNOT.equals(((COSDictionary) underneathObject).getCOSName(COSName.TYPE));
}
private boolean isStream(Object selectedNode)
@@ -849,19 +847,16 @@ public class PDFDebugger extends JFrame
selectedNode = getUnderneathObject(selectedNode);
if (selectedNode instanceof COSDictionary)
{
- COSDictionary dic = (COSDictionary)selectedNode;
- return dic.containsKey(COSName.TYPE) &&
- dic.getCOSName(COSName.TYPE).equals(COSName.FONT) &&
- !isCIDFont(dic);
+ COSDictionary dic = (COSDictionary) selectedNode;
+ return COSName.FONT.equals(dic.getCOSName(COSName.TYPE)) && !isCIDFont(dic);
}
return false;
}
private boolean isCIDFont(COSDictionary dic)
{
- return dic.containsKey(COSName.SUBTYPE) &&
- (dic.getCOSName(COSName.SUBTYPE).equals(COSName.CID_FONT_TYPE0)
- || dic.getCOSName(COSName.SUBTYPE).equals(COSName.CID_FONT_TYPE2));
+ return COSName.CID_FONT_TYPE0.equals(dic.getCOSName(COSName.SUBTYPE)) ||
+ COSName.CID_FONT_TYPE2.equals(dic.getCOSName(COSName.SUBTYPE));
}
/**