svn commit: r1697483 - in /pdfbox/trunk/pdfbox/src: main/java/org/apache/pdfbox/cos/COSInputStream.java test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java

[jahewson]

Author: jahewson
Date: Mon Aug 24 19:15:52 2015
New Revision: 1697483

URL: http://svn.apache.org/r1697483
Log:
PDFBOX-2893: Close scratch buffer after it has been read

Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java

pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java?rev=1697483r1=1697482r2=1697483view=diff
==
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSInputStream.java 
Mon Aug 24 19:15:52 2015
@@ -65,11 +65,17 @@ public final class COSInputStream extend
 if (scratchFile != null)
 {
 // scratch file
-RandomAccess buffer = scratchFile.createBuffer();
+final RandomAccess buffer = scratchFile.createBuffer();
 DecodeResult result = filters.get(i).decode(input, new 
RandomAccessOutputStream(buffer), parameters, i);
 results.add(result);
-input = new RandomAccessInputStream(buffer);
-buffer.close();
+input = new RandomAccessInputStream(buffer)
+{
+@Override
+public void close() throws IOException
+{
+buffer.close();
+}
+};
 }
 else
 {

Modified: 
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1697483r1=1697482r2=1697483view=diff
==
--- 
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
 Mon Aug 24 19:15:52 2015
@@ -70,6 +70,21 @@ public class PDFMergerUtilityTest extend
 true);
 }
 
+// see PDFBOX-2893
+public void testPDFMergerUtility2() throws IOException
+{
+checkMergeIdentical(PDFBox.GlobalResourceMergeTest.Doc01.pdf,
+PDFBox.GlobalResourceMergeTest.Doc02.pdf,
+GlobalResourceMergeTestResult.pdf,
+false);
+
+// once again, with scratch file
+checkMergeIdentical(PDFBox.GlobalResourceMergeTest.Doc01.pdf,
+PDFBox.GlobalResourceMergeTest.Doc02.pdf,
+GlobalResourceMergeTestResult2.pdf,
+true);
+}
+
 // checks that the result file of a merge has the same rendering as the two
 // source files
 private void checkMergeIdentical(String filename1, String filename2, 
String mergeFilename, 

svn commit: r1697346 - /pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java

[msahyoun]

Author: msahyoun
Date: Mon Aug 24 09:54:05 2015
New Revision: 1697346

URL: http://svn.apache.org/r1697346
Log:
PDFBOX-2602: use StringBuilder instead of StringBuffer

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

Modified: 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java?rev=1697346r1=1697345r2=1697346view=diff
==
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java 
(original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java Mon 
Aug 24 09:54:05 2015
@@ -136,7 +136,7 @@ public class TextToPDF
 int lineIndex = 0;
 while( lineIndex  lineWords.length )
 {
-StringBuffer nextLineToDraw = new StringBuffer();
+StringBuilder nextLineToDraw = new StringBuilder();
 float lengthIfUsingNextWord = 0;
 do
 {

svn commit: r1697511 - /pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/hexviewer/UpperPane.java

[jahewson]

Author: jahewson
Date: Mon Aug 24 22:40:53 2015
New Revision: 1697511

URL: http://svn.apache.org/r1697511
Log:
PDFBOX-2941: Dump - Text

Modified:

pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/hexviewer/UpperPane.java

Modified: 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/hexviewer/UpperPane.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/hexviewer/UpperPane.java?rev=1697511r1=1697510r2=1697511view=diff
==
--- 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/hexviewer/UpperPane.java
 (original)
+++ 
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/pdfdebugger/hexviewer/UpperPane.java
 Mon Aug 24 22:40:53 2015
@@ -64,6 +64,6 @@ class UpperPane extends JPanel
 }
 
 x+=HexView.LINE_INSET*2;
-g.drawString(Dump, x, y);
+g.drawString(Text, x, y);
 }
 }