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

More clean-up

Browse Source
This commit is contained in:
Harald Kuhr 2024-04-11 20:10:33 +02:00
parent e2cc73f276
commit ce25d0e349
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
View File

@ -1350,31 +1350,40 @@ public final class TIFFImageReader extends ImageReaderBase {
} }
} }
if (stripTileOffsets == null || stripTileOffsets.length == 1 && realJPEGOffset == stripTileOffsets[0]) { if (stripTileOffsets == null || stripTileOffsets.length == 1) {
// In this case, we'll just read everything as a single tile // In this case, we'll just read everything as a single tile
jpegHeader = new byte[0]; jpegHeader = new byte[0];
if (stripTileOffsets != null) {
stripTileOffsets[0] = realJPEGOffset;
}
} }
else { else {
// Wang TIFF weirdness, see http://www.eztwain.com/wangtiff.htm
// If the first tile stream starts with SOS, we'll correct offset/length
imageInput.seek(stripTileOffsets[0]); imageInput.seek(stripTileOffsets[0]);
if (((imageInput.readByte() & 0xFF) << 8 | (imageInput.readByte() & 0xFF)) == JPEG.SOS) { if (((imageInput.readByte() & 0xFF) << 8 | (imageInput.readByte() & 0xFF)) == JPEG.SOS) {
// Wang TIFF weirdness, see http://www.eztwain.com/wangtiff.htm
// If the first tile stream starts with SOS, we'll correct offset/length
processWarningOccurred("Incorrect StripOffsets/TileOffsets, points to SOS marker, ignoring offsets/byte counts."); processWarningOccurred("Incorrect StripOffsets/TileOffsets, points to SOS marker, ignoring offsets/byte counts.");
int len = 2 + ((imageInput.readByte() & 0xFF) << 8 | (imageInput.readByte() & 0xFF));
// TODO: There might be data between tables and the SOS here... int sosLength = 2 + ((imageInput.readByte() & 0xFF) << 8 | (imageInput.readByte() & 0xFF));
// We forward warnings from the JPEG reading delegate about "Corrupt JPEG data: N extraneous bytes before marker 0xda" (SOS),
// We didn't do this before, as we didn't add a warning listener for Old JPEG/6...
stripTileOffsets[0] += len; // TODO: Validate that values make sense?
stripTileByteCounts[0] -= len;
}
// We'll prepend each tile with a JFIF "header" (SOI...SOS) // We'll prepend each tile with a JFIF "header" (SOI...
jpegHeader = new byte[Math.max(0, jpegLength + sosLength)];
imageInput.seek(realJPEGOffset); imageInput.seek(realJPEGOffset);
jpegHeader = new byte[Math.max(0, (int) (stripTileOffsets[0] - realJPEGOffset))]; imageInput.readFully(jpegHeader, 0, jpegLength);
imageInput.readFully(jpegHeader); // ...SOS)
imageInput.seek(stripTileOffsets[0]);
imageInput.readFully(jpegHeader, jpegLength, sosLength);
stripTileOffsets[0] += sosLength;
stripTileByteCounts[0] -= sosLength;
}
else {
jpegHeader = new byte[0];
}
} }
// In case of single tile, make sure we read the entire JFIF stream // In case of single tile, make sure we read the entire JFIF stream
@ -1438,8 +1447,10 @@ public final class TIFFImageReader extends ImageReaderBase {
// If the tile stream starts with SOS... // If the tile stream starts with SOS...
if (tileIndex == 0) { if (tileIndex == 0) {
if (((imageInput.readByte() & 0xFF) << 8 | (imageInput.readByte() & 0xFF)) == JPEG.SOS) { if (((imageInput.readByte() & 0xFF) << 8 | (imageInput.readByte() & 0xFF)) == JPEG.SOS) {
imageInput.seek(stripTileOffsets[tileIndex] + 14); // TODO: Read from SOS length from stream, in case of gray/CMYK int sosLength = 2 + ((imageInput.readByte() & 0xFF) << 8 | (imageInput.readByte() & 0xFF));
length -= 14;
imageInput.seek(stripTileOffsets[tileIndex] + sosLength);
length -= sosLength;
} }
else { else {
imageInput.seek(stripTileOffsets[tileIndex]); imageInput.seek(stripTileOffsets[tileIndex]);