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

TMI-121: Clean up.

Browse Source
This commit is contained in:
Harald Kuhr 2015-03-22 14:25:29 +01:00
parent 449db69d27
commit 3ce0a8594f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,13 +117,12 @@ final class JPEGSegmentImageInputStream extends ImageInputStreamImpl {
marker = 0xff00 | stream.readUnsignedByte(); marker = 0xff00 | stream.readUnsignedByte();
} }
// TODO: Should we just skip all app marker segments? // We are now handling all important segments ourselves, except APP1/Exif and APP14/Adobe, as these
// We are now handling all important segments ourselves boolean appSegmentMarker = isAppSegmentMarker(marker);
// TODO: Need to re-insert the APP14, and instead make sure we limit it to 16 bytes, boolean isApp14Adobe = marker == JPEG.APP14 && isAppSegmentWithId("Adobe", stream);
// OR use two delegates, one for reading image data, and one for reading metadata... boolean isApp1Exif = marker == JPEG.APP1 && isAppSegmentWithId("Exif", stream);
boolean isApp14Adobe = false;
if (isAppSegmentMarker(marker) && !(marker == JPEG.APP1 && isAppSegmentWithId("Exif", stream) if (appSegmentMarker && !(isApp1Exif || isApp14Adobe)) {
|| (isApp14Adobe = (marker == JPEG.APP14 && isAppSegmentWithId("Adobe", stream))))) {
int length = stream.readUnsignedShort(); // Length including length field itself int length = stream.readUnsignedShort(); // Length including length field itself
stream.seek(realPosition + 2 + length); // Skip marker (2) + length stream.seek(realPosition + 2 + length); // Skip marker (2) + length
} }