Author: ssteiner
Date: Wed Nov 10 08:50:14 2021
New Revision: 1894901
URL: http://svn.apache.org/viewvc?rev=1894901&view=rev
Log:
FOP-3034: Update PDFBox to 2.0.24
Added:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/FOPCFFDataInput.java
(with props)
xmlgraphics/fop/trunk/fop/lib/fontbox-2.0.24.jar (with props)
Removed:
xmlgraphics/fop/trunk/fop/lib/fontbox-2.0.21.jar
Modified:
xmlgraphics/fop/trunk/fop-core/pom.xml
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java
Modified: xmlgraphics/fop/trunk/fop-core/pom.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/pom.xml?rev=1894901&r1=1894900&r2=1894901&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/pom.xml (original)
+++ xmlgraphics/fop/trunk/fop-core/pom.xml Wed Nov 10 08:50:14 2021
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
- <version>2.0.21</version>
+ <version>2.0.24</version>
</dependency>
<dependency>
<groupId>javax.media</groupId>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>2.0.21</version>
+ <version>2.0.24</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java?rev=1894901&r1=1894900&r2=1894901&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/CFFDataReader.java
Wed Nov 10 08:50:14 2021
@@ -64,7 +64,7 @@ public class CFFDataReader {
* @param cffDataArray A byte array which holds the CFF data
*/
public CFFDataReader(byte[] cffDataArray) throws IOException {
- cffData = new CFFDataInput(cffDataArray);
+ cffData = new FOPCFFDataInput(cffDataArray);
readCFFData();
}
@@ -74,7 +74,7 @@ public class CFFDataReader {
* @param fontFile The font file as represented by a FontFileReader object
*/
public CFFDataReader(FontFileReader fontFile) throws IOException {
- cffData = new CFFDataInput(OTFFile.getCFFData(fontFile));
+ cffData = new FOPCFFDataInput(OTFFile.getCFFData(fontFile));
readCFFData();
}
Added:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/FOPCFFDataInput.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/FOPCFFDataInput.java?rev=1894901&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/FOPCFFDataInput.java
(added)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/FOPCFFDataInput.java
Wed Nov 10 08:50:14 2021
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.fonts.cff;
+
+import java.io.IOException;
+
+import org.apache.fontbox.cff.CFFDataInput;
+
+public class FOPCFFDataInput extends CFFDataInput {
+ public FOPCFFDataInput(byte[] buffer) {
+ super(buffer);
+ }
+
+ public int readOffSize() throws IOException {
+ return readUnsignedByte();
+ }
+}
Propchange:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fonts/cff/FOPCFFDataInput.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: xmlgraphics/fop/trunk/fop/lib/fontbox-2.0.24.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/lib/fontbox-2.0.24.jar?rev=1894901&view=auto
==============================================================================
Binary file - no diff available.
Propchange: xmlgraphics/fop/trunk/fop/lib/fontbox-2.0.24.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
