You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/03/14 15:24:50 UTC
svn commit: r1887635 - in
/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger:
PDFDebugger.java fontencodingpane/Type0Font.java ui/PageEntry.java
Author: lehmi
Date: Sun Mar 14 15:24:50 2021
New Revision: 1887635
URL: http://svn.apache.org/viewvc?rev=1887635&view=rev
Log:
PDFBOX-4892: use convenience methods to simplify code, add new constants
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/Type0Font.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PageEntry.java
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java?rev=1887635&r1=1887634&r2=1887635&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java Sun Mar 14 15:24:50 2021
@@ -965,14 +965,14 @@ public class PDFDebugger extends JFrame
{
Object pageObj = path.getParentPath().getLastPathComponent();
COSDictionary page = (COSDictionary) getUnderneathObject(pageObj);
- resourcesDic = (COSDictionary) page.getDictionaryObject(COSName.RESOURCES);
+ resourcesDic = page.getCOSDictionary(COSName.RESOURCES);
isContentStream = true;
}
else if (COSName.CONTENTS.equals(parentKey) || COSName.CHAR_PROCS.equals(parentKey))
{
Object pageObj = path.getParentPath().getParentPath().getLastPathComponent();
COSDictionary page = (COSDictionary) getUnderneathObject(pageObj);
- resourcesDic = (COSDictionary) page.getDictionaryObject(COSName.RESOURCES);
+ resourcesDic = page.getCOSDictionary(COSName.RESOURCES);
isContentStream = true;
}
else if (COSName.FORM.equals(stream.getCOSName(COSName.SUBTYPE)) ||
@@ -981,7 +981,7 @@ public class PDFDebugger extends JFrame
{
if (stream.containsKey(COSName.RESOURCES))
{
- resourcesDic = (COSDictionary) stream.getDictionaryObject(COSName.RESOURCES);
+ resourcesDic = stream.getCOSDictionary(COSName.RESOURCES);
}
isContentStream = true;
}
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/Type0Font.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/Type0Font.java?rev=1887635&r1=1887634&r2=1887635&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/Type0Font.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/Type0Font.java Sun Mar 14 15:24:50 2021
@@ -16,7 +16,6 @@
package org.apache.pdfbox.debugger.fontencodingpane;
-import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
@@ -112,11 +111,9 @@ class Type0Font extends FontPane
{
Object[][] cid2gid = null;
COSDictionary dict = font.getCOSObject();
- COSBase map = dict.getDictionaryObject(COSName.CID_TO_GID_MAP);
- if (map instanceof COSStream)
+ COSStream stream = dict.getCOSStream(COSName.CID_TO_GID_MAP);
+ if (stream != null)
{
- COSStream stream = (COSStream) map;
-
InputStream is = stream.createInputStream();
byte[] mapAsBytes = IOUtils.toByteArray(is);
IOUtils.closeQuietly(is);
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PageEntry.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PageEntry.java?rev=1887635&r1=1887634&r2=1887635&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PageEntry.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PageEntry.java Sun Mar 14 15:24:50 2021
@@ -18,7 +18,6 @@
package org.apache.pdfbox.debugger.ui;
import org.apache.pdfbox.cos.COSArray;
-import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
@@ -64,18 +63,16 @@ public class PageEntry
COSDictionary node = dict;
while (node.containsKey(COSName.PARENT))
{
- COSBase base = node.getDictionaryObject(COSName.PARENT);
- if (!(base instanceof COSDictionary))
+ COSDictionary parent = node.getCOSDictionary(COSName.PARENT);
+ if (parent == null)
{
return "";
}
- COSDictionary parent = (COSDictionary) base;
- base = parent.getDictionaryObject(COSName.KIDS);
- if (!(base instanceof COSArray))
+ COSArray kids = parent.getCOSArray(COSName.KIDS);
+ if (kids == null)
{
return "";
}
- COSArray kids = (COSArray) base;
int idx = kids.indexOfObject(node);
sb.append("/Kids/[").append(idx).append("]");
node = parent;