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/04 19:43:37 UTC
svn commit: r1870845 - in /pdfbox/trunk:
fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/TestPDFunctionType4.java
Author: tilman
Date: Wed Dec 4 19:43:37 2019
New Revision: 1870845
URL: http://svn.apache.org/viewvc?rev=1870845&view=rev
Log:
PDFBOX-4071: use standard charset
Modified:
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/TestPDFunctionType4.java
Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java?rev=1870845&r1=1870844&r2=1870845&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Wed Dec 4 19:43:37 2019
@@ -22,7 +22,7 @@ import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Iterator;
@@ -181,7 +181,7 @@ public final class TTFSubsetter
}
checksum &= 0xffffffffL;
- byte[] tagbytes = tag.getBytes("US-ASCII");
+ byte[] tagbytes = tag.getBytes(StandardCharsets.US_ASCII);
out.write(tagbytes, 0, 4);
out.writeInt((int)checksum);
@@ -428,7 +428,7 @@ public final class TTFSubsetter
writeUint32(out, 0);
writeUint32(out, 0);
- out.write(os2.getAchVendId().getBytes("US-ASCII"));
+ out.write(os2.getAchVendId().getBytes(StandardCharsets.US_ASCII));
writeUint16(out, os2.getFsSelection());
writeUint16(out, uniToGID.firstKey());
@@ -879,7 +879,7 @@ public final class TTFSubsetter
// names[numberNewGlyphs]
for (String name : names.keySet())
{
- byte[] buf = name.getBytes(Charset.forName("US-ASCII"));
+ byte[] buf = name.getBytes(StandardCharsets.US_ASCII);
writeUint8(out, buf.length);
out.write(buf);
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/TestPDFunctionType4.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/TestPDFunctionType4.java?rev=1870845&r1=1870844&r2=1870845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/TestPDFunctionType4.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/function/TestPDFunctionType4.java Wed Dec 4 19:43:37 2019
@@ -18,6 +18,7 @@ package org.apache.pdfbox.pdmodel.common
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import junit.framework.TestCase;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSStream;
@@ -42,7 +43,7 @@ public class TestPDFunctionType4 extends
try (OutputStream out = stream.createOutputStream())
{
- byte[] data = function.getBytes("US-ASCII");
+ byte[] data = function.getBytes(StandardCharsets.US_ASCII);
out.write(data, 0, data.length);
}