Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-05 12:35:29 -04:00
Code Issues Projects Releases Wiki Activity

More tolerant CCITT reading if the stream contains less lines than are tried to read

Browse Source
This commit is contained in:
Oliver Schmidtmer 2016-02-17 15:08:06 +01:00
parent a1de9ff448
commit 2258b4def2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/CCITTFaxDecoderStream.java
View File

@ -34,6 +34,7 @@ import java.io.EOFException;
import java.io.FilterInputStream; import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
/** /**
* CCITT Modified Huffman RLE, Group 3 (T4) and Group 4 (T6) fax compression. * CCITT Modified Huffman RLE, Group 3 (T4) and Group 4 (T6) fax compression.
@ -403,14 +404,14 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
@Override @Override
public int read() throws IOException { public int read() throws IOException {
if (decodedLength < 0) { if (decodedLength < 0) {
return -1; return 0xFF;
} }
if (decodedPos >= decodedLength) { if (decodedPos >= decodedLength) {
fetch(); fetch();
if (decodedLength < 0) { if (decodedLength < 0) {
return -1; return 0xFF;
} }
} }
@ -420,14 +421,16 @@ final class CCITTFaxDecoderStream extends FilterInputStream {
@Override @Override
public int read(byte[] b, int off, int len) throws IOException { public int read(byte[] b, int off, int len) throws IOException {
if (decodedLength < 0) { if (decodedLength < 0) {
return -1; Arrays.fill(b, off, len, (byte)0xFF);
return len;
} }
if (decodedPos >= decodedLength) { if (decodedPos >= decodedLength) {
fetch(); fetch();
if (decodedLength < 0) { if (decodedLength < 0) {
return -1; Arrays.fill(b, off, len, (byte)0xFF);
return len;
} }
} }