Skip to content

Commit b28c864

Browse files
committed
PDFBOX-5660: avoid default encoding
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1927195 13f79535-47bb-0310-9956-ffa450edef68
1 parent 2b128ec commit b28c864

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.PrintStream;
2424
import java.io.PrintWriter;
2525
import java.io.Writer;
26+
import java.nio.charset.Charset;
2627
import java.util.Map;
2728
import java.util.Set;
2829
import java.util.TreeSet;
@@ -308,7 +309,7 @@ private Writer createOutputWriter() throws IOException
308309
{
309310
if (toConsole)
310311
{
311-
return new PrintWriter(SYSOUT)
312+
return new PrintWriter(SYSOUT, true, Charset.forName(encoding))
312313
{
313314
@Override
314315
public void close()

tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.io.File;
2020
import java.io.IOException;
2121
import java.io.PrintStream;
22+
import java.nio.file.Files;
2223

2324
import java.util.concurrent.Callable;
2425

@@ -117,9 +118,14 @@ public Integer call()
117118
SYSERR.println("No XMP metadata available");
118119
return 1;
119120
}
120-
try (PrintStream ps = toConsole ? SYSOUT : new PrintStream(outfile))
121+
if (toConsole)
121122
{
122-
ps.write(meta.toByteArray());
123+
SYSOUT.write(meta.toByteArray());
124+
SYSOUT.flush();
125+
}
126+
else
127+
{
128+
Files.write(outfile.toPath(), meta.toByteArray());
123129
}
124130
}
125131
catch (IOException ioe)

0 commit comments

Comments
 (0)