Skip to content

Commit 25803a9

Browse files
committed
PDFBOX-5660: avoid default encoding
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1927113 13f79535-47bb-0310-9956-ffa450edef68
1 parent 917d498 commit 25803a9

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.io.InputStream;
2222
import java.io.InputStreamReader;
2323
import java.io.LineNumberReader;
24+
import java.nio.charset.StandardCharsets;
2425
import java.util.Arrays;
2526
import java.util.Comparator;
2627
import java.util.Map;
@@ -227,7 +228,7 @@ private OpenTypeScript()
227228
private static void parseScriptsFile(InputStream inputStream) throws IOException
228229
{
229230
Map<int[], String> unicodeRanges = new TreeMap<>(Comparator.comparingInt(o -> o[0]));
230-
try (LineNumberReader rd = new LineNumberReader(new InputStreamReader(inputStream)))
231+
try (LineNumberReader rd = new LineNumberReader(new InputStreamReader(inputStream, StandardCharsets.US_ASCII)))
231232
{
232233
int[] lastRange = { Integer.MIN_VALUE, Integer.MIN_VALUE };
233234
String lastScript = null;

fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.BufferedReader;
2424
import java.io.IOException;
2525
import java.io.InputStreamReader;
26+
import java.nio.charset.StandardCharsets;
2627
import java.util.ArrayList;
2728
import java.util.Arrays;
2829
import java.util.Collection;
@@ -91,7 +92,8 @@ private Map<List<Integer>, List<Integer>> getExpectedGsubTableRawData(String pat
9192
Map<List<Integer>, List<Integer>> gsubData = new HashMap<>();
9293

9394
try (BufferedReader br = new BufferedReader(
94-
new InputStreamReader(TestTTFParser.class.getResourceAsStream(pathToResource))))
95+
new InputStreamReader(
96+
TestTTFParser.class.getResourceAsStream(pathToResource), StandardCharsets.US_ASCII)))
9597
{
9698
while (true)
9799
{

pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.LineNumberReader;
2424
import java.io.StringWriter;
2525
import java.io.Writer;
26+
import java.nio.charset.StandardCharsets;
2627
import java.text.Bidi;
2728
import java.text.Normalizer;
2829
import java.util.ArrayDeque;
@@ -1994,7 +1995,7 @@ private String handleDirection(String word)
19941995
*/
19951996
private static void parseBidiFile(InputStream inputStream) throws IOException
19961997
{
1997-
LineNumberReader rd = new LineNumberReader(new InputStreamReader(inputStream));
1998+
LineNumberReader rd = new LineNumberReader(new InputStreamReader(inputStream, StandardCharsets.US_ASCII));
19981999

19992000
do
20002001
{

0 commit comments

Comments
 (0)