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/04/18 12:20:11 UTC
svn commit: r1888894 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: contentstream/
pdfparser/ pdmodel/font/ pdmodel/interactive/annotation/handlers/
pdmodel/interactive/form/
Author: lehmi
Date: Sun Apr 18 12:20:11 2021
New Revision: 1888894
URL: http://svn.apache.org/viewvc?rev=1888894&view=rev
Log:
PDFBOX-4892: content streams never contain COSObjects
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java?rev=1888894&r1=1888893&r2=1888894&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Sun Apr 18 12:20:11 2021
@@ -38,7 +38,6 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.filter.MissingImageReaderException;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
@@ -490,11 +489,7 @@ public abstract class PDFStreamEngine
Object token = parser.parseNextToken();
while (token != null)
{
- if (token instanceof COSObject)
- {
- arguments.add(((COSObject) token).getObject());
- }
- else if (token instanceof Operator)
+ if (token instanceof Operator)
{
processOperator((Operator) token, arguments);
arguments = new ArrayList<>();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java?rev=1888894&r1=1888893&r2=1888894&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java Sun Apr 18 12:20:11 2021
@@ -31,7 +31,6 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNull;
import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.io.RandomAccessReadBuffer;
/**
@@ -159,16 +158,6 @@ public class PDFStreamParser extends Bas
{
return Operator.getOperator(next);
}
- case 'R':
- String line = readString();
- if( line.equals( "R" ) )
- {
- return new COSObject(null);
- }
- else
- {
- return Operator.getOperator(line);
- }
case '0':
case '1':
case '2':
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java?rev=1888894&r1=1888893&r2=1888894&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Sun Apr 18 12:20:11 2021
@@ -25,7 +25,6 @@ import org.apache.pdfbox.contentstream.P
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
@@ -105,11 +104,7 @@ public final class PDType3CharProc imple
Object token = parser.parseNextToken();
while (token != null)
{
- if (token instanceof COSObject)
- {
- arguments.add(((COSObject) token).getObject());
- }
- else if (token instanceof Operator)
+ if (token instanceof Operator)
{
if (((Operator) token).getName().equals("d1") && arguments.size() == 6)
{
@@ -160,11 +155,7 @@ public final class PDType3CharProc imple
Object token = parser.parseNextToken();
while (token != null)
{
- if (token instanceof COSObject)
- {
- arguments.add(((COSObject) token).getObject());
- }
- else if (token instanceof Operator)
+ if (token instanceof Operator)
{
return parseWidth((Operator) token, arguments);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java?rev=1888894&r1=1888893&r2=1888894&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java Sun Apr 18 12:20:11 2021
@@ -27,7 +27,6 @@ import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
import org.apache.pdfbox.pdmodel.PDAppearanceContentStream;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -386,11 +385,7 @@ public class PDFreeTextAppearanceHandler
Operator graphicOp = null;
for (Object token = parser.parseNextToken(); token != null; token = parser.parseNextToken())
{
- if (token instanceof COSObject)
- {
- arguments.add(((COSObject) token).getObject());
- }
- else if (token instanceof Operator)
+ if (token instanceof Operator)
{
Operator op = (Operator) token;
String name = op.getName();
@@ -456,11 +451,7 @@ public class PDFreeTextAppearanceHandler
COSArray fontArguments = new COSArray();
for (Object token = parser.parseNextToken(); token != null; token = parser.parseNextToken())
{
- if (token instanceof COSObject)
- {
- arguments.add(((COSObject) token).getObject());
- }
- else if (token instanceof Operator)
+ if (token instanceof Operator)
{
Operator op = (Operator) token;
String name = op.getName();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java?rev=1888894&r1=1888893&r2=1888894&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java Sun Apr 18 12:20:11 2021
@@ -27,7 +27,6 @@ import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
import org.apache.pdfbox.pdmodel.PDResources;
@@ -101,11 +100,7 @@ class PDDefaultAppearanceString
Object token = parser.parseNextToken();
while (token != null)
{
- if (token instanceof COSObject)
- {
- arguments.add(((COSObject) token).getObject());
- }
- else if (token instanceof Operator)
+ if (token instanceof Operator)
{
processOperator((Operator) token, arguments);
arguments = new ArrayList<>();