You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/06/01 12:13:36 UTC
svn commit: r1878360 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: Loader.java
io/RandomAccessReadFile.java pdmodel/graphics/image/CCITTFactory.java
Author: lehmi
Date: Mon Jun 1 12:13:35 2020
New Revision: 1878360
URL: http://svn.apache.org/viewvc?rev=1878360&view=rev
Log:
PDFBOX-4855: replace RandomAccessReadFile with RandomAccessReadMemoryMappedFile
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadFile.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactory.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java?rev=1878360&r1=1878359&r2=1878360&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java Mon Jun 1 12:13:35 2020
@@ -26,8 +26,7 @@ import java.io.InputStream;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.io.MemoryUsageSetting;
import org.apache.pdfbox.io.RandomAccessReadBuffer;
-import org.apache.pdfbox.io.RandomAccessBufferedFile;
-import org.apache.pdfbox.io.RandomAccessReadFile;
+import org.apache.pdfbox.io.RandomAccessReadMemoryMappedFile;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.io.ScratchFile;
import org.apache.pdfbox.pdfparser.FDFParser;
@@ -73,7 +72,7 @@ public class Loader
*/
public static FDFDocument loadFDF(File file) throws IOException
{
- FDFParser parser = new FDFParser(new RandomAccessReadFile(file));
+ FDFParser parser = new FDFParser(new RandomAccessReadMemoryMappedFile(file));
return parser.parse();
}
@@ -297,7 +296,8 @@ public class Loader
MemoryUsageSetting memUsageSetting) throws IOException
{
@SuppressWarnings({ "squid:S2095" }) // raFile not closed here, may be needed for signing
- RandomAccessBufferedFile raFile = new RandomAccessBufferedFile(file);
+ // RandomAccessBufferedFile raFile = new RandomAccessBufferedFile(file);
+ RandomAccessReadMemoryMappedFile raFile = new RandomAccessReadMemoryMappedFile(file);
try
{
return Loader.loadPDF(raFile, password, keyStore, alias, memUsageSetting);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactory.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactory.java?rev=1878360&r1=1878359&r2=1878360&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactory.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactory.java Mon Jun 1 12:13:35 2020
@@ -28,7 +28,7 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.filter.Filter;
import org.apache.pdfbox.filter.FilterFactory;
import org.apache.pdfbox.io.RandomAccessReadBuffer;
-import org.apache.pdfbox.io.RandomAccessReadFile;
+import org.apache.pdfbox.io.RandomAccessReadMemoryMappedFile;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
@@ -189,7 +189,7 @@ public final class CCITTFactory
public static PDImageXObject createFromFile(PDDocument document, File file, int number)
throws IOException
{
- try (RandomAccessReadFile raf = new RandomAccessReadFile(file))
+ try (RandomAccessRead raf = new RandomAccessReadMemoryMappedFile(file))
{
return createFromRandomAccessImpl(document, raf, number);
}