FOP-2656: Update to PDFBox 2.0.3

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1764839 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index 00ba4f08a76e73422ef0da39bc259127ce55277d..baf28e89a78ce2ada8491e4477b711c207bfdbc2 100644 (file)
--- a/fop-core/pom.xml
+++ b/fop-core/pom.xml
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>fontbox</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.3</version>
     </dependency>
     <!-- test deps -->
     <dependency>

diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java b/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java
index 0a6613a36de0edab5fbaba53189c2cd21ab19f3b..8d068c988cd3ea35c07cc394ea3178936c949e62 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/Type1CharStringFormatter.java
@@ -41,8 +41,8 @@ public class Type1CharStringFormatter {
         for (Object object : sequence) {
             if (object instanceof CharStringCommand) {
                 writeCommand((CharStringCommand) object);
-            } else if (object instanceof Integer) {
-                writeNumber((Integer) object);
+            } else if (object instanceof Number) {
+                writeNumber(((Number) object).intValue());
             } else {
                 throw new IllegalArgumentException();
             }

diff --git a/fop/lib/fontbox-2.0.0.jar b/fop/lib/fontbox-2.0.0.jar
deleted file mode 100644 (file)
index 3edbcfb..0000000
Binary files a/fop/lib/fontbox-2.0.0.jar and /dev/null differ

diff --git a/fop/lib/fontbox-2.0.3.jar b/fop/lib/fontbox-2.0.3.jar
new file mode 100644 (file)
index 0000000..20ef202
Binary files /dev/null and b/fop/lib/fontbox-2.0.3.jar differ