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 2015/11/21 13:48:53 UTC
svn commit: r1715508 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator:
graphics/ state/
Author: tilman
Date: Sat Nov 21 12:48:53 2015
New Revision: 1715508
URL: http://svn.apache.org/viewvc?rev=1715508&view=rev
Log:
PDFBOX-2982: avoid ClassCastException
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Concatenate.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java?rev=1715508&r1=1715507&r2=1715508&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/AppendRectangleToPath.java Sat Nov 21 12:48:53 2015
@@ -39,6 +39,10 @@ public final class AppendRectangleToPath
{
throw new MissingOperandException(operator, operands);
}
+ if (!checkArrayTypesClass(operands, COSNumber.class))
+ {
+ return;
+ }
COSNumber x = (COSNumber) operands.get(0);
COSNumber y = (COSNumber) operands.get(1);
COSNumber w = (COSNumber) operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java?rev=1715508&r1=1715507&r2=1715508&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveTo.java Sat Nov 21 12:48:53 2015
@@ -43,6 +43,10 @@ public class CurveTo extends GraphicsOpe
{
throw new MissingOperandException(operator, operands);
}
+ if (!checkArrayTypesClass(operands, COSNumber.class))
+ {
+ return;
+ }
COSNumber x1 = (COSNumber)operands.get(0);
COSNumber y1 = (COSNumber)operands.get(1);
COSNumber x2 = (COSNumber)operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java?rev=1715508&r1=1715507&r2=1715508&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateFinalPoint.java Sat Nov 21 12:48:53 2015
@@ -39,6 +39,10 @@ public final class CurveToReplicateFinal
{
throw new MissingOperandException(operator, operands);
}
+ if (!checkArrayTypesClass(operands, COSNumber.class))
+ {
+ return;
+ }
COSNumber x1 = (COSNumber)operands.get(0);
COSNumber y1 = (COSNumber)operands.get(1);
COSNumber x3 = (COSNumber)operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java?rev=1715508&r1=1715507&r2=1715508&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/CurveToReplicateInitialPoint.java Sat Nov 21 12:48:53 2015
@@ -43,6 +43,10 @@ public class CurveToReplicateInitialPoin
{
throw new MissingOperandException(operator, operands);
}
+ if (!checkArrayTypesClass(operands, COSNumber.class))
+ {
+ return;
+ }
COSNumber x2 = (COSNumber)operands.get(0);
COSNumber y2 = (COSNumber)operands.get(1);
COSNumber x3 = (COSNumber)operands.get(2);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Concatenate.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Concatenate.java?rev=1715508&r1=1715507&r2=1715508&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Concatenate.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/Concatenate.java Sat Nov 21 12:48:53 2015
@@ -40,6 +40,10 @@ public class Concatenate extends Operato
{
throw new MissingOperandException(operator, arguments);
}
+ if (!checkArrayTypesClass(arguments, COSNumber.class))
+ {
+ return;
+ }
// concatenate matrix to current transformation matrix
COSNumber a = (COSNumber) arguments.get(0);