From: Simon Steiner <ssteiner@apache.org>
Date: Fri, 14 Oct 2016 09:02:56 +0000 (+0000)
Subject: FOP-2656: Update to PDFBox 2.0.3
X-Git-Tag: fop-2_2~35
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cff195d6957cd413572440fccf952fbb5a6dc615;p=xmlgraphics-fop.git

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 00ba4f08a..baf28e89a 100644
--- 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 0a6613a36..8d068c988 100644
--- 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
index 3edbcfb83..000000000
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
index 000000000..20ef2028b
Binary files /dev/null and b/fop/lib/fontbox-2.0.3.jar differ