svn commit: r1927195 - in /pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools: ExtractText.java ExtractXMP.java

[tilman]

Author: tilman
Date: Sun Jul 13 15:11:19 2025
New Revision: 1927195

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

Modified:
    pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
    pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java

Modified: 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java?rev=1927195&r1=1927194&r2=1927195&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java 
(original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java 
Sun Jul 13 15:11:19 2025
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.Writer;
+import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -308,7 +309,7 @@ public final class ExtractText  implemen
     {
         if (toConsole)
         {
-            return new PrintWriter(SYSOUT)
+            return new PrintWriter(SYSOUT, true, Charset.forName(encoding))
             {
                 @Override
                 public void close()

Modified: 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java?rev=1927195&r1=1927194&r2=1927195&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java 
(original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java 
Sun Jul 13 15:11:19 2025
@@ -19,6 +19,7 @@ package org.apache.pdfbox.tools;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.file.Files;
 
 import java.util.concurrent.Callable;
 
@@ -117,9 +118,14 @@ public class ExtractXMP implements Calla
                 SYSERR.println("No XMP metadata available");
                 return 1;
             }
-            try (PrintStream ps = toConsole ? SYSOUT : new 
PrintStream(outfile))
+            if (toConsole)
             {
-                ps.write(meta.toByteArray());
+                SYSOUT.write(meta.toByteArray());
+                SYSOUT.flush();
+            }
+            else
+            {
+                Files.write(outfile.toPath(), meta.toByteArray());
             }
         }
         catch (IOException ioe)