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:57:55 UTC
svn commit: r1870846 - in /pdfbox/branches/issue4569:
fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
Author: tilman
Date: Wed Dec 4 19:57:55 2019
New Revision: 1870846
URL: http://svn.apache.org/viewvc?rev=1870846&view=rev
Log:
PDFBOX-4071: use standard charset; simplify code
Modified:
pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
pdfbox/branches/issue4569/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
Modified: pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java?rev=1870846&r1=1870845&r2=1870846&view=diff
==============================================================================
--- pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java (original)
+++ pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/ttf/TTFSubsetter.java Wed Dec 4 19:57:55 2019
@@ -22,6 +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;
@@ -305,27 +306,23 @@ public final class TTFSubsetter
{
int platform = record.getPlatformId();
int encoding = record.getPlatformEncodingId();
- String charset = "ISO-8859-1";
+ Charset charset = StandardCharsets.ISO_8859_1;
if (platform == CmapTable.PLATFORM_WINDOWS &&
encoding == CmapTable.ENCODING_WIN_UNICODE_BMP)
{
- charset = "UTF-16BE";
+ charset = StandardCharsets.UTF_16BE;
}
else if (platform == 2) // ISO [deprecated]=
{
if (encoding == 0) // 7-bit ASCII
{
- charset = "US-ASCII";
+ charset = StandardCharsets.US_ASCII;
}
else if (encoding == 1) // ISO 10646=
{
//not sure is this is correct??
- charset = "UTF16-BE";
- }
- else if (encoding == 2) // ISO 8859-1
- {
- charset = "ISO-8859-1";
+ charset = StandardCharsets.UTF_16BE;
}
}
String value = record.getString();
Modified: pdfbox/branches/issue4569/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java?rev=1870846&r1=1870845&r2=1870846&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestPDDocument.java Wed Dec 4 19:57:55 2019
@@ -25,11 +25,11 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Locale;
import org.apache.pdfbox.io.IOUtils;
-import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdfparser.PDFParser;
import junit.framework.TestCase;
@@ -67,8 +67,8 @@ public class TestPDDocument extends Test
// Verify content
byte[] pdf = baos.toByteArray();
assertTrue(pdf.length > 200);
- assertEquals("%PDF-1.4", new String(Arrays.copyOfRange(pdf, 0, 8), "UTF-8"));
- assertEquals("%%EOF\n", new String(Arrays.copyOfRange(pdf, pdf.length - 6, pdf.length), "UTF-8"));
+ assertEquals("%PDF-1.4", new String(Arrays.copyOfRange(pdf, 0, 8), StandardCharsets.UTF_8));
+ assertEquals("%%EOF\n", new String(Arrays.copyOfRange(pdf, pdf.length - 6, pdf.length), StandardCharsets.UTF_8));
// Load
PDDocument loadDoc = PDFParser.load(new ByteArrayInputStream(pdf));
@@ -97,8 +97,8 @@ public class TestPDDocument extends Test
byte[] pdf = IOUtils.toByteArray(in);
in.close();
assertTrue(pdf.length > 200);
- assertEquals("%PDF-1.4", new String(Arrays.copyOfRange(pdf, 0, 8), "UTF-8"));
- assertEquals("%%EOF\n", new String(Arrays.copyOfRange(pdf, pdf.length - 6, pdf.length), "UTF-8"));
+ assertEquals("%PDF-1.4", new String(Arrays.copyOfRange(pdf, 0, 8), StandardCharsets.UTF_8));
+ assertEquals("%%EOF\n", new String(Arrays.copyOfRange(pdf, pdf.length - 6, pdf.length), StandardCharsets.UTF_8));
// Load
PDDocument loadDoc = PDFParser.load(targetFile);