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 2019/12/07 19:35:52 UTC
svn commit: r1871003 - in /pdfbox/trunk:
examples/src/main/java/org/apache/pdfbox/examples/signature/
fontbox/src/test/java/org/apache/fontbox/afm/
pdfbox/src/main/java/org/apache/pdfbox/cos/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/ pdfbox/src/m...
Author: tilman
Date: Sat Dec 7 19:35:52 2019
New Revision: 1871003
URL: http://svn.apache.org/viewvc?rev=1871003&view=rev
Log:
PDFBOX-4071: use standard charset
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java?rev=1871003&r1=1871002&r2=1871003&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java Sat Dec 7 19:35:52 2019
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
@@ -61,7 +62,6 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.encryption.SecurityProvider;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature;
-import org.apache.pdfbox.util.Charsets;
import org.apache.pdfbox.util.Hex;
import org.bouncycastle.asn1.cms.Attribute;
import org.bouncycastle.asn1.cms.CMSAttributes;
@@ -313,7 +313,7 @@ public final class ShowSignature
System.err.println("'<' expected at offset " + byteRange[1] + ", but got " + (char) c);
}
byte[] contentFromFile = raf.readFully(byteRange[2] - byteRange[1] - 2);
- byte[] contentAsHex = Hex.getString(contents.getBytes()).getBytes(Charsets.US_ASCII);
+ byte[] contentAsHex = Hex.getString(contents.getBytes()).getBytes(StandardCharsets.US_ASCII);
if (contentFromFile.length != contentAsHex.length)
{
System.err.println("Raw content length from file is " +
Modified: pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java?rev=1871003&r1=1871002&r2=1871003&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java (original)
+++ pdfbox/trunk/fontbox/src/test/java/org/apache/fontbox/afm/AFMParserTest.java Sat Dec 7 19:35:52 2019
@@ -19,7 +19,7 @@ package org.apache.fontbox.afm;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.apache.fontbox.util.Charsets;
+import java.nio.charset.StandardCharsets;
import org.junit.Assert;
import org.junit.Test;
@@ -34,7 +34,7 @@ public class AFMParserTest
{
try
{
- new AFMParser(new ByteArrayInputStream("huhu".getBytes(Charsets.US_ASCII))).parse();
+ new AFMParser(new ByteArrayInputStream("huhu".getBytes(StandardCharsets.US_ASCII))).parse();
}
catch (IOException ex)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java?rev=1871003&r1=1871002&r2=1871003&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSString.java Sat Dec 7 19:35:52 2019
@@ -18,11 +18,11 @@ package org.apache.pdfbox.cos;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.util.Charsets;
import org.apache.pdfbox.util.Hex;
/**
@@ -91,7 +91,7 @@ public final class COSString extends COS
else
{
// UTF-16BE encoded string with a leading byte order marker
- byte[] data = text.getBytes(Charsets.UTF_16BE);
+ byte[] data = text.getBytes(StandardCharsets.UTF_16BE);
bytes = new byte[data.length + 2];
bytes[0] = (byte) 0xFE;
bytes[1] = (byte) 0xFF;
@@ -181,12 +181,12 @@ public final class COSString extends COS
if ((bytes[0] & 0xff) == 0xFE && (bytes[1] & 0xff) == 0xFF)
{
// UTF-16BE
- return new String(bytes, 2, bytes.length - 2, Charsets.UTF_16BE);
+ return new String(bytes, 2, bytes.length - 2, StandardCharsets.UTF_16BE);
}
else if ((bytes[0] & 0xff) == 0xFF && (bytes[1] & 0xff) == 0xFE)
{
// UTF-16LE - not in the PDF spec!
- return new String(bytes, 2, bytes.length - 2, Charsets.UTF_16LE);
+ return new String(bytes, 2, bytes.length - 2, StandardCharsets.UTF_16LE);
}
}
@@ -200,7 +200,7 @@ public final class COSString extends COS
public String getASCII()
{
// ASCII string
- return new String(bytes, Charsets.US_ASCII);
+ return new String(bytes, StandardCharsets.US_ASCII);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java?rev=1871003&r1=1871002&r2=1871003&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java Sat Dec 7 19:35:52 2019
@@ -22,6 +22,7 @@ import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.text.NumberFormat;
import java.util.ArrayDeque;
import java.util.ArrayList;
@@ -64,7 +65,6 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
import org.apache.pdfbox.pdmodel.graphics.state.RenderingMode;
-import org.apache.pdfbox.util.Charsets;
import org.apache.pdfbox.util.Matrix;
import org.apache.pdfbox.util.NumberFormatUtil;
@@ -1420,7 +1420,7 @@ abstract class PDAbstractContentStream i
throw new IllegalArgumentException("comment should not include a newline");
}
outputStream.write('%');
- outputStream.write(comment.getBytes(Charsets.US_ASCII));
+ outputStream.write(comment.getBytes(StandardCharsets.US_ASCII));
outputStream.write('\n');
}
@@ -1474,7 +1474,7 @@ abstract class PDAbstractContentStream i
*/
protected void writeOperator(String text) throws IOException
{
- outputStream.write(text.getBytes(Charsets.US_ASCII));
+ outputStream.write(text.getBytes(StandardCharsets.US_ASCII));
outputStream.write('\n');
}
@@ -1485,7 +1485,7 @@ abstract class PDAbstractContentStream i
*/
protected void write(String text) throws IOException
{
- outputStream.write(text.getBytes(Charsets.US_ASCII));
+ outputStream.write(text.getBytes(StandardCharsets.US_ASCII));
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java?rev=1871003&r1=1871002&r2=1871003&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPageContentStream.java Sat Dec 7 19:35:52 2019
@@ -21,6 +21,7 @@ import java.awt.geom.PathIterator;
import java.io.Closeable;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -40,7 +41,6 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
import org.apache.pdfbox.pdmodel.graphics.image.PDInlineImage;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
-import org.apache.pdfbox.util.Charsets;
import org.apache.pdfbox.util.Matrix;
/**
@@ -186,7 +186,7 @@ public final class PDPageContentStream e
// save the pre-append graphics state
try (OutputStream prefixOut = prefixStream.createOutputStream())
{
- prefixOut.write("q".getBytes(Charsets.US_ASCII));
+ prefixOut.write("q".getBytes(StandardCharsets.US_ASCII));
prefixOut.write('\n');
}
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=1871003&r1=1871002&r2=1871003&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 Sat Dec 7 19:35:52 2019
@@ -16,11 +16,11 @@
package org.apache.pdfbox.pdmodel.interactive.annotation.handlers;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fontbox.util.Charsets;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorName;
import org.apache.pdfbox.cos.COSArray;
@@ -371,7 +371,7 @@ public class PDFreeTextAppearanceHandler
try
{
// not sure if charset is correct, but we only need numbers and simple characters
- PDFStreamParser parser = new PDFStreamParser(defaultAppearance.getBytes(Charsets.US_ASCII));
+ PDFStreamParser parser = new PDFStreamParser(defaultAppearance.getBytes(StandardCharsets.US_ASCII));
COSArray arguments = new COSArray();
COSArray colors = null;
Operator graphicOp = null;
@@ -442,7 +442,7 @@ public class PDFreeTextAppearanceHandler
try
{
// not sure if charset is correct, but we only need numbers and simple characters
- PDFStreamParser parser = new PDFStreamParser(defaultAppearance.getBytes(Charsets.US_ASCII));
+ PDFStreamParser parser = new PDFStreamParser(defaultAppearance.getBytes(StandardCharsets.US_ASCII));
COSArray arguments = new COSArray();
COSArray fontArguments = new COSArray();
for (Object token = parser.parseNextToken(); token != null; token = parser.parseNextToken())