stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8270952: Improve TIFF file handling

Browse Source 
Reviewed-by: jdv, psadhukhan, mschoene, rhalade
This commit is contained in:
Phil Race 2021-08-16 18:19:08 +00:00 committed by Henry Jen
parent 1fddb03d93
commit 9a94fbc793
1 changed files with 3 additions and 15 deletions

18
src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFNullDecompressor.java

@ -136,12 +136,7 @@ public class TIFFNullDecompressor extends TIFFDecompressor {
int lastRow = activeSrcHeight - 1;
for (int y = 0; y < activeSrcHeight; y++) {
int bytesRead = stream.read(b, dstOffset, activeBytesPerRow);
if (bytesRead < 0) {
throw new EOFException();
} else if (bytesRead != activeBytesPerRow) {
break;
}
stream.readFully(b, dstOffset, activeBytesPerRow);
dstOffset += scanlineStride;
// Skip unneeded bytes (row suffix + row prefix).
@ -154,17 +149,10 @@ public class TIFFNullDecompressor extends TIFFDecompressor {
stream.seek(offset);
int bytesPerRow = (srcWidth*bitsPerPixel + 7)/8;
if(bytesPerRow == scanlineStride) {
if (stream.read(b, dstOffset, bytesPerRow*srcHeight) < 0) {
throw new EOFException();
}
stream.readFully(b, dstOffset, bytesPerRow*srcHeight);
} else {
for (int y = 0; y < srcHeight; y++) {
int bytesRead = stream.read(b, dstOffset, bytesPerRow);
if (bytesRead < 0) {
throw new EOFException();
} else if (bytesRead != bytesPerRow) {
break;
}
stream.readFully(b, dstOffset, bytesPerRow);
dstOffset += scanlineStride;
}
}