svn commit: r1927112 - in /pdfbox/branches/3.0: fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java

[tilman]

Author: tilman
Date: Thu Jul 10 17:18:17 2025
New Revision: 1927112

URL: http://svn.apache.org/viewvc?rev=1927112&view=rev
Log:
PDFBOX-5660: avoid default encoding

Modified:
    
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
    
pdfbox/branches/3.0/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java
    
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java

Modified: 
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java?rev=1927112&r1=1927111&r2=1927112&view=diff
==============================================================================
--- 
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
 (original)
+++ 
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/OpenTypeScript.java
 Thu Jul 10 17:18:17 2025
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -238,7 +239,7 @@ public final class OpenTypeScript
     private static void parseScriptsFile(InputStream inputStream) throws 
IOException
     {
         Map<int[], String> unicodeRanges = new TreeMap<>((o1, o2) -> 
Integer.compare(o1[0], o2[0]));
-        try (LineNumberReader rd = new LineNumberReader(new 
InputStreamReader(inputStream)))
+        try (LineNumberReader rd = new LineNumberReader(new 
InputStreamReader(inputStream, StandardCharsets.US_ASCII)))
         {
             int[] lastRange = { Integer.MIN_VALUE, Integer.MIN_VALUE };
             String lastScript = null;

Modified: 
pdfbox/branches/3.0/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/3.0/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java?rev=1927112&r1=1927111&r2=1927112&view=diff
==============================================================================
--- 
pdfbox/branches/3.0/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java
 (original)
+++ 
pdfbox/branches/3.0/fontbox/src/test/java/org/apache/fontbox/ttf/GlyphSubstitutionTableTest.java
 Thu Jul 10 17:18:17 2025
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Asse
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -90,7 +91,8 @@ class GlyphSubstitutionTableTest
         Map<List<Integer>, Integer> gsubData = new HashMap<>();
 
         try (BufferedReader br = new BufferedReader(
-             new 
InputStreamReader(TestTTFParser.class.getResourceAsStream(pathToResource))))
+             new InputStreamReader(
+                     TestTTFParser.class.getResourceAsStream(pathToResource), 
StandardCharsets.US_ASCII)))
         {
             while (true)
             {

Modified: 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java?rev=1927112&r1=1927111&r2=1927112&view=diff
==============================================================================
--- 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
 (original)
+++ 
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
 Thu Jul 10 17:18:17 2025
@@ -23,6 +23,7 @@ import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.text.Bidi;
 import java.text.Normalizer;
 import java.util.ArrayDeque;
@@ -1991,7 +1992,7 @@ public class PDFTextStripper extends Leg
      */
     private static void parseBidiFile(InputStream inputStream) throws 
IOException
     {
-        LineNumberReader rd = new LineNumberReader(new 
InputStreamReader(inputStream));
+        LineNumberReader rd = new LineNumberReader(new 
InputStreamReader(inputStream, StandardCharsets.US_ASCII));
 
         do
         {