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/05/17 12:58:32 UTC
svn commit: r1877858 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/ main/java/org/apache/pdfbox/io/
main/java/org/apache/pdfbox/pdfparser/
main/java/org/apache/pdfbox/pdmodel/graphics/image/
main/java/org/apache/pdfbox/pdmodel/interactive/...
Author: lehmi
Date: Sun May 17 12:58:32 2020
New Revision: 1877858
URL: http://svn.apache.org/viewvc?rev=1877858&view=rev
Log:
PDFBOX-4838: limit RandomAccessBuffer and RandomAccessFile to reads operations, rename classes to RandomAccessReadBuffer and RandomAccessReadFile
Added:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBuffer.java
- copied, changed from r1877857, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBuffer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadFile.java
- copied, changed from r1877857, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessFile.java
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBuffer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessFile.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/TestRandomAccessBuffer.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/TestRandomAccessOutputStream.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/CCITTFactory.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/RandomAccessSourceTest.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=1877858&r1=1877857&r2=1877858&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 Sun May 17 12:58:32 2020
@@ -25,8 +25,9 @@ import java.io.InputStream;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.io.RandomAccessBuffer;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.io.RandomAccessBufferedFile;
+import org.apache.pdfbox.io.RandomAccessReadFile;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.io.ScratchFile;
import org.apache.pdfbox.pdfparser.FDFParser;
@@ -58,8 +59,7 @@ public class Loader
*/
public static FDFDocument loadFDF(String filename) throws IOException
{
- FDFParser parser = new FDFParser(filename);
- return parser.parse();
+ return Loader.loadFDF(new File(filename));
}
/**
@@ -73,7 +73,7 @@ public class Loader
*/
public static FDFDocument loadFDF(File file) throws IOException
{
- FDFParser parser = new FDFParser(file);
+ FDFParser parser = new FDFParser(new RandomAccessReadFile(file));
return parser.parse();
}
@@ -88,7 +88,7 @@ public class Loader
*/
public static FDFDocument loadFDF(InputStream input) throws IOException
{
- FDFParser parser = new FDFParser(input);
+ FDFParser parser = new FDFParser(new RandomAccessReadBuffer(input));
return parser.parse();
}
@@ -198,7 +198,7 @@ public class Loader
MemoryUsageSetting memUsageSetting) throws IOException
{
ScratchFile scratchFile = new ScratchFile(memUsageSetting);
- RandomAccessRead source = new RandomAccessBuffer(input);
+ RandomAccessRead source = new RandomAccessReadBuffer(input);
PDFParser parser = new PDFParser(source, password, keyStore, alias, scratchFile);
return parser.parse();
}
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBuffer.java (from r1877857, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBuffer.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBuffer.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBuffer.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBuffer.java&r1=1877857&r2=1877858&rev=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBuffer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBuffer.java Sun May 17 12:58:32 2020
@@ -22,10 +22,10 @@ import java.util.ArrayList;
import java.util.List;
/**
- * An implementation of the RandomAccess interface to store data in memory.
- * The data will be stored in chunks organized in an ArrayList.
+ * An implementation of the RandomAccessRead interface to store data in memory. The data will be stored in chunks
+ * organized in an ArrayList.
*/
-public class RandomAccessBuffer implements RandomAccess, Cloneable
+public class RandomAccessReadBuffer implements RandomAccessRead, Cloneable
{
// default chunk size is 1kb
private static final int DEFAULT_CHUNK_SIZE = 1024;
@@ -49,7 +49,7 @@ public class RandomAccessBuffer implemen
/**
* Default constructor.
*/
- public RandomAccessBuffer()
+ public RandomAccessReadBuffer()
{
this(DEFAULT_CHUNK_SIZE);
}
@@ -57,7 +57,7 @@ public class RandomAccessBuffer implemen
/**
* Default constructor.
*/
- private RandomAccessBuffer(int definedChunkSize)
+ private RandomAccessReadBuffer(int definedChunkSize)
{
// starting with one chunk
bufferList = new ArrayList<>();
@@ -76,7 +76,7 @@ public class RandomAccessBuffer implemen
*
* @param input the byte array to be read
*/
- public RandomAccessBuffer(byte[] input)
+ public RandomAccessReadBuffer(byte[] input)
{
// this is a special case. The given byte array is used as the one
// and only chunk.
@@ -92,12 +92,12 @@ public class RandomAccessBuffer implemen
}
/**
- * Create a random access buffer of the given input stream by copying the data.
+ * Create a random access read buffer of the given input stream by copying the data.
*
* @param input the input stream to be read
* @throws IOException if something went wrong while copying the data
*/
- public RandomAccessBuffer(InputStream input) throws IOException
+ public RandomAccessReadBuffer(InputStream input) throws IOException
{
this();
byte[] byteBuffer = new byte[8192];
@@ -110,9 +110,9 @@ public class RandomAccessBuffer implemen
}
@Override
- public RandomAccessBuffer clone()
+ public RandomAccessReadBuffer clone()
{
- RandomAccessBuffer copy = new RandomAccessBuffer(chunkSize);
+ RandomAccessReadBuffer copy = new RandomAccessReadBuffer(chunkSize);
copy.bufferList = new ArrayList<>(bufferList.size());
for (byte [] buffer : bufferList)
@@ -156,22 +156,6 @@ public class RandomAccessBuffer implemen
* {@inheritDoc}
*/
@Override
- public void clear()
- {
- bufferList.clear();
- currentBuffer = new byte[chunkSize];
- bufferList.add(currentBuffer);
- pointer = 0;
- currentBufferPointer = 0;
- size = 0;
- bufferListIndex = 0;
- bufferListMaxIndex = 0;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public void seek(long position) throws IOException
{
checkClosed();
@@ -300,54 +284,7 @@ public class RandomAccessBuffer implemen
return size;
}
- /**
- * {@inheritDoc}
- */
- @Override
- public void write(int b) throws IOException
- {
- checkClosed();
- // end of buffer reached?
- if (currentBufferPointer >= chunkSize)
- {
- if (pointer + chunkSize >= Integer.MAX_VALUE)
- {
- throw new IOException("RandomAccessBuffer overflow");
- }
- expandBuffer();
- }
- currentBuffer[currentBufferPointer++] = (byte)b;
- pointer++;
- if (pointer > this.size)
- {
- this.size = pointer;
- }
- // end of buffer reached now?
- if (currentBufferPointer >= chunkSize)
- {
- if (pointer + chunkSize >= Integer.MAX_VALUE)
- {
- throw new IOException("RandomAccessBuffer overflow");
- }
- expandBuffer();
- }
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void write(byte[] b) throws IOException
- {
- write(b, 0, b.length);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void write(byte[] b, int offset, int length) throws IOException
+ private void write(byte[] b, int offset, int length) throws IOException
{
checkClosed();
long newSize = pointer + length;
@@ -363,8 +300,8 @@ public class RandomAccessBuffer implemen
int newOffset = offset + remainingBytes;
long remainingBytes2Write = length - remainingBytes;
// determine how many buffers are needed for the remaining bytes
- int numberOfNewArrays = (int)remainingBytes2Write / chunkSize;
- for (int i=0;i<numberOfNewArrays;i++)
+ int numberOfNewArrays = (int) remainingBytes2Write / chunkSize;
+ for (int i = 0; i < numberOfNewArrays; i++)
{
expandBuffer();
System.arraycopy(b, newOffset, currentBuffer, currentBufferPointer, chunkSize);
@@ -377,9 +314,10 @@ public class RandomAccessBuffer implemen
expandBuffer();
if (remainingBytes2Write > 0)
{
- System.arraycopy(b, newOffset, currentBuffer, currentBufferPointer, (int)remainingBytes2Write);
+ System.arraycopy(b, newOffset, currentBuffer, currentBufferPointer,
+ (int) remainingBytes2Write);
}
- currentBufferPointer = (int)remainingBytes2Write;
+ currentBufferPointer = (int) remainingBytes2Write;
}
}
else
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadFile.java (from r1877857, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessFile.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadFile.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadFile.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessFile.java&r1=1877857&r2=1877858&rev=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessFile.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadFile.java Sun May 17 12:58:32 2020
@@ -21,12 +21,11 @@ import java.io.FileNotFoundException;
import java.io.IOException;
/**
- * A RandomAccess implementation which allows data to be stored in a scratch file on the disk to
- * reduce memory consumption.
+ * A RandomAccessRead implementation backed by a java.io.RandomAccessFile.
*
* @author Ben Litchfield
*/
-public class RandomAccessFile implements RandomAccess
+public class RandomAccessReadFile implements RandomAccessRead
{
private final java.io.RandomAccessFile ras;
private boolean isClosed;
@@ -35,12 +34,11 @@ public class RandomAccessFile implements
* Constructor.
*
* @param file The file to write the data to.
- * @param mode The writing mode.
* @throws FileNotFoundException If the file cannot be created.
*/
- public RandomAccessFile(File file, String mode) throws FileNotFoundException
+ public RandomAccessReadFile(File file) throws FileNotFoundException
{
- ras = new java.io.RandomAccessFile(file, mode);
+ ras = new java.io.RandomAccessFile(file, "r");
}
@Override
@@ -51,14 +49,6 @@ public class RandomAccessFile implements
}
@Override
- public void clear() throws IOException
- {
- checkClosed();
- ras.seek(0);
- ras.setLength(0);
- }
-
- @Override
public void seek(long position) throws IOException
{
checkClosed();
@@ -121,26 +111,6 @@ public class RandomAccessFile implements
}
@Override
- public void write(byte[] b, int offset, int length) throws IOException
- {
- checkClosed();
- ras.write(b, offset, length);
- }
-
- @Override
- public void write(byte[] b) throws IOException
- {
- write(b, 0, b.length);
- }
-
- @Override
- public void write(int b) throws IOException
- {
- checkClosed();
- ras.write(b);
- }
-
- @Override
public int peek() throws IOException
{
int result = read();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java?rev=1877858&r1=1877857&r2=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ScratchFile.java Sun May 17 12:58:32 2020
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
*
* <p>Using this class for {@link RandomAccess} buffers allows for a direct control
* on the maximum memory usage and allows processing large files for which we
- * otherwise would get an {@link OutOfMemoryError} in case of using {@link RandomAccessBuffer}.</p>
+ * otherwise would get an {@link OutOfMemoryError} in case of using {@link RandomAccessReadBuffer}.</p>
*
* <p>This base class for providing pages is thread safe (the buffer implementations are not).</p>
*/
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1877858&r1=1877857&r2=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Sun May 17 12:58:32 2020
@@ -171,10 +171,11 @@ public class COSParser extends BaseParse
*
* @param source input representing the pdf.
*/
- public COSParser(RandomAccessRead source)
+ public COSParser(RandomAccessRead source) throws IOException
{
super(new RandomAccessSource(source));
this.source = source;
+ fileLen = source.length();
}
/**
@@ -187,12 +188,13 @@ public class COSParser extends BaseParse
*
*/
public COSParser(RandomAccessRead source, String password, InputStream keyStore,
- String keyAlias)
+ String keyAlias) throws IOException
{
super(new RandomAccessSource(source));
this.source = source;
this.password = password;
this.keyAlias = keyAlias;
+ fileLen = source.length();
keyStoreInputStream = keyStore;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java?rev=1877858&r1=1877857&r2=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/FDFParser.java Sun May 17 12:58:32 2020
@@ -16,9 +16,7 @@
*/
package org.apache.pdfbox.pdfparser;
-import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -26,8 +24,7 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSDocument;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.io.IOUtils;
-import org.apache.pdfbox.io.RandomAccessBuffer;
-import org.apache.pdfbox.io.RandomAccessFile;
+import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.pdmodel.fdf.FDFDocument;
public class FDFParser extends COSParser
@@ -41,36 +38,9 @@ public class FDFParser extends COSParser
*
* @throws IOException If something went wrong.
*/
- public FDFParser(String filename) throws IOException
+ public FDFParser(RandomAccessRead source) throws IOException
{
- this(new File(filename));
- }
-
- /**
- * Constructs parser for given file using given buffer for temporary
- * storage.
- *
- * @param file the pdf to be parsed
- *
- * @throws IOException If something went wrong.
- */
- public FDFParser(File file) throws IOException
- {
- super(new RandomAccessFile(file, "r"));
- fileLen = file.length();
- init();
- }
-
- /**
- * Constructor.
- *
- * @param input input stream representing the pdf.
- * @throws IOException If something went wrong.
- */
- public FDFParser(InputStream input) throws IOException
- {
- super(new RandomAccessBuffer(input));
- fileLen = source.length();
+ super(source);
init();
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java?rev=1877858&r1=1877857&r2=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java Sun May 17 12:58:32 2020
@@ -122,7 +122,6 @@ public class PDFParser extends COSParser
String alias, ScratchFile scratchFile) throws IOException
{
super(source, decryptionPassword, keyStore, alias);
- fileLen = source.length();
init(scratchFile);
}
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=1877858&r1=1877857&r2=1877858&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 Sun May 17 12:58:32 2020
@@ -27,9 +27,9 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.filter.Filter;
import org.apache.pdfbox.filter.FilterFactory;
-import org.apache.pdfbox.io.RandomAccess;
-import org.apache.pdfbox.io.RandomAccessBuffer;
-import org.apache.pdfbox.io.RandomAccessFile;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
+import org.apache.pdfbox.io.RandomAccessReadFile;
+import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
@@ -127,7 +127,7 @@ public final class CCITTFactory
public static PDImageXObject createFromByteArray(PDDocument document, byte[] byteArray, int number)
throws IOException
{
- try (RandomAccess raf = new RandomAccessBuffer(byteArray))
+ try (RandomAccessRead raf = new RandomAccessReadBuffer(byteArray))
{
return createFromRandomAccessImpl(document, raf, number);
}
@@ -189,7 +189,7 @@ public final class CCITTFactory
public static PDImageXObject createFromFile(PDDocument document, File file, int number)
throws IOException
{
- try (RandomAccessFile raf = new RandomAccessFile(file, "r"))
+ try (RandomAccessReadFile raf = new RandomAccessReadFile(file))
{
return createFromRandomAccessImpl(document, raf, number);
}
@@ -206,7 +206,7 @@ public final class CCITTFactory
* @throws IOException if there is an error reading the TIFF data.
*/
private static PDImageXObject createFromRandomAccessImpl(PDDocument document,
- RandomAccess reader,
+ RandomAccessRead reader,
int number) throws IOException
{
COSDictionary decodeParms = new COSDictionary();
@@ -231,7 +231,8 @@ public final class CCITTFactory
}
// extracts the CCITT stream from the TIFF file
- private static void extractFromTiff(RandomAccess reader, OutputStream os,
+ private static void extractFromTiff(RandomAccessRead reader,
+ OutputStream os,
COSDictionary params, int number) throws IOException
{
try
@@ -456,7 +457,7 @@ public final class CCITTFactory
}
}
- private static int readshort(char endianess, RandomAccess raf) throws IOException
+ private static int readshort(char endianess, RandomAccessRead raf) throws IOException
{
if (endianess == 'I')
{
@@ -465,7 +466,7 @@ public final class CCITTFactory
return (raf.read() << 8) | raf.read();
}
- private static int readlong(char endianess, RandomAccess raf) throws IOException
+ private static int readlong(char endianess, RandomAccessRead raf) throws IOException
{
if (endianess == 'I')
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java?rev=1877858&r1=1877857&r2=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java Sun May 17 12:58:32 2020
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.pdfbox.cos.COSDocument;
-import org.apache.pdfbox.io.RandomAccessBuffer;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.io.RandomAccessBufferedFile;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.pdfparser.PDFParser;
@@ -90,7 +90,7 @@ public class SignatureOptions implements
*/
public void setVisualSignature(InputStream is) throws IOException
{
- initFromRandomAccessRead(new RandomAccessBuffer(is));
+ initFromRandomAccessRead(new RandomAccessReadBuffer(is));
}
private void initFromRandomAccessRead(RandomAccessRead rar) throws IOException
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/RandomAccessSourceTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/RandomAccessSourceTest.java?rev=1877858&r1=1877857&r2=1877858&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/RandomAccessSourceTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/RandomAccessSourceTest.java Sun May 17 12:58:32 2020
@@ -19,7 +19,7 @@ package org.apache.pdfbox.pdfparser;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import org.apache.pdfbox.io.RandomAccessBuffer;
+import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.junit.Assert;
import org.junit.Test;
@@ -35,7 +35,7 @@ public class RandomAccessSourceTest
ByteArrayInputStream bais = new ByteArrayInputStream(inputValues);
RandomAccessSource randomAccessSource = new RandomAccessSource(
- new RandomAccessBuffer(bais));
+ new RandomAccessReadBuffer(bais));
Assert.assertEquals(0, randomAccessSource.getPosition());
randomAccessSource.skip(5);
@@ -51,7 +51,7 @@ public class RandomAccessSourceTest
ByteArrayInputStream bais = new ByteArrayInputStream(inputValues);
RandomAccessSource randomAccessSource = new RandomAccessSource(
- new RandomAccessBuffer(bais));
+ new RandomAccessReadBuffer(bais));
Assert.assertEquals(0, randomAccessSource.getPosition());
randomAccessSource.read();
@@ -69,7 +69,7 @@ public class RandomAccessSourceTest
ByteArrayInputStream bais = new ByteArrayInputStream(inputValues);
RandomAccessSource randomAccessSource = new RandomAccessSource(
- new RandomAccessBuffer(bais));
+ new RandomAccessReadBuffer(bais));
Assert.assertEquals(0, randomAccessSource.getPosition());
byte[] buffer = new byte[4];
@@ -89,7 +89,7 @@ public class RandomAccessSourceTest
ByteArrayInputStream bais = new ByteArrayInputStream(inputValues);
RandomAccessSource randomAccessSource = new RandomAccessSource(
- new RandomAccessBuffer(bais));
+ new RandomAccessReadBuffer(bais));
Assert.assertEquals(0, randomAccessSource.getPosition());
randomAccessSource.skip(6);
@@ -108,7 +108,7 @@ public class RandomAccessSourceTest
ByteArrayInputStream bais = new ByteArrayInputStream(inputValues);
RandomAccessSource randomAccessSource = new RandomAccessSource(
- new RandomAccessBuffer(bais));
+ new RandomAccessReadBuffer(bais));
Assert.assertEquals(0, randomAccessSource.getPosition());
randomAccessSource.read();