Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 20:15:28 -04:00
Code Issues Projects Releases Wiki Activity

#274 Fixed bug in 16 -> 8 bit downsampling of DQT, causing "Bogus marker length" IIOException

Browse Source
This commit is contained in:
Harald Kuhr 2016-11-23 20:40:48 +01:00
parent 654e111605
commit f0316f7ec5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGSegmentImageInputStream.java
View File

@ -361,7 +361,6 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
return stream.read(b, off, len); return stream.read(b, off, len);
} }
@Override @Override
public String toString() { public String toString() {
return String.format("0x%04x[%d-%d]", marker, realStart, realEnd()); return String.format("0x%04x[%d-%d]", marker, realStart, realEnd());
@ -409,7 +408,7 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
byte[] replacementData = new byte[length]; byte[] replacementData = new byte[length];
int numQTs = length / 128; int numQTs = length / 128;
int newSegmentLength = 2 + 1 + 64 * numQTs; int newSegmentLength = 2 + (1 + 64) * numQTs; // Len + (qtInfo + qtSize) * numQTs
replacementData[0] = (byte) ((JPEG.DQT >> 8) & 0xff); replacementData[0] = (byte) ((JPEG.DQT >> 8) & 0xff);
replacementData[1] = (byte) (JPEG.DQT & 0xff); replacementData[1] = (byte) (JPEG.DQT & 0xff);