Index: trunk/src/com/drew/imaging/jpeg/JpegMetadataReader.java =================================================================== --- trunk/src/com/drew/imaging/jpeg/JpegMetadataReader.java (revision 8243) +++ trunk/src/com/drew/imaging/jpeg/JpegMetadataReader.java (revision 10862) @@ -1,4 +1,4 @@ /* - * Copyright 2002-2015 Drew Noakes + * Copyright 2002-2016 Drew Noakes * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,6 +39,8 @@ import com.drew.metadata.iptc.IptcReader; //import com.drew.metadata.jfif.JfifReader; +//import com.drew.metadata.jfxx.JfxxReader; import com.drew.metadata.jpeg.JpegCommentReader; import com.drew.metadata.jpeg.JpegReader; +//import com.drew.metadata.photoshop.DuckyReader; //import com.drew.metadata.photoshop.PhotoshopReader; //import com.drew.metadata.xmp.XmpReader; @@ -55,8 +57,10 @@ new JpegCommentReader(), //new JfifReader(), + //new JfxxReader(), new ExifReader(), //new XmpReader(), //new IccReader(), //new PhotoshopReader(), + //new DuckyReader(), new IptcReader()//, //new AdobeJpegReader() Index: trunk/src/com/drew/imaging/jpeg/JpegProcessingException.java =================================================================== --- trunk/src/com/drew/imaging/jpeg/JpegProcessingException.java (revision 8243) +++ trunk/src/com/drew/imaging/jpeg/JpegProcessingException.java (revision 10862) @@ -1,4 +1,4 @@ /* - * Copyright 2002-2015 Drew Noakes + * Copyright 2002-2016 Drew Noakes * * Licensed under the Apache License, Version 2.0 (the "License"); Index: trunk/src/com/drew/imaging/jpeg/JpegSegmentData.java =================================================================== --- trunk/src/com/drew/imaging/jpeg/JpegSegmentData.java (revision 8243) +++ trunk/src/com/drew/imaging/jpeg/JpegSegmentData.java (revision 10862) @@ -1,4 +1,4 @@ /* - * Copyright 2002-2015 Drew Noakes + * Copyright 2002-2016 Drew Noakes * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -52,5 +52,4 @@ * @param segmentBytes the byte array holding data for the segment being added */ - @SuppressWarnings({"MismatchedQueryAndUpdateOfCollection"}) public void addSegment(byte segmentType, @NotNull byte[] segmentBytes) { @@ -207,5 +206,4 @@ * @param occurrence the zero-based index of the segment occurrence to remove. */ - @SuppressWarnings({"MismatchedQueryAndUpdateOfCollection"}) public void removeSegmentOccurrence(@NotNull JpegSegmentType segmentType, int occurrence) { @@ -220,5 +218,4 @@ * @param occurrence the zero-based index of the segment occurrence to remove. */ - @SuppressWarnings({"MismatchedQueryAndUpdateOfCollection"}) public void removeSegmentOccurrence(byte segmentType, int occurrence) { Index: trunk/src/com/drew/imaging/jpeg/JpegSegmentReader.java =================================================================== --- trunk/src/com/drew/imaging/jpeg/JpegSegmentReader.java (revision 8243) +++ trunk/src/com/drew/imaging/jpeg/JpegSegmentReader.java (revision 10862) @@ -1,4 +1,4 @@ /* - * Copyright 2002-2015 Drew Noakes + * Copyright 2002-2016 Drew Noakes * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,4 +43,9 @@ public class JpegSegmentReader { + /** + * The 0xFF byte that signals the start of a segment. + */ + private static final byte SEGMENT_IDENTIFIER = (byte) 0xFF; + /** * Private, because this segment crashes my algorithm, and searching for it doesn't work (yet). @@ -112,17 +117,12 @@ // by a 0xFF and then a byte not equal to 0x00 or 0xFF. - final short segmentIdentifier = reader.getUInt8(); + byte segmentIdentifier = reader.getInt8(); + byte segmentType = reader.getInt8(); - // We must have at least one 0xFF byte - if (segmentIdentifier != 0xFF) - throw new JpegProcessingException("Expected JPEG segment start identifier 0xFF, not 0x" + Integer.toHexString(segmentIdentifier).toUpperCase()); - - // Read until we have a non-0xFF byte. This identifies the segment type. - byte segmentType = reader.getInt8(); - while (segmentType == (byte)0xFF) - segmentType = reader.getInt8(); - - if (segmentType == 0) - throw new JpegProcessingException("Expected non-zero byte as part of JPEG marker identifier"); + // Read until we have a 0xFF byte followed by a byte that is not 0xFF or 0x00 + while (segmentIdentifier != SEGMENT_IDENTIFIER || segmentType == SEGMENT_IDENTIFIER || segmentType == 0) { + segmentIdentifier = segmentType; + segmentType = reader.getInt8(); + } if (segmentType == SEGMENT_SOS) { Index: trunk/src/com/drew/imaging/jpeg/JpegSegmentType.java =================================================================== --- trunk/src/com/drew/imaging/jpeg/JpegSegmentType.java (revision 8243) +++ trunk/src/com/drew/imaging/jpeg/JpegSegmentType.java (revision 10862) @@ -1,4 +1,4 @@ /* - * Copyright 2002-2015 Drew Noakes + * Copyright 2002-2016 Drew Noakes * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -30,15 +30,20 @@ * An enumeration of the known segment types found in JPEG files. * + * + * * @author Drew Noakes https://drewnoakes.com */ public enum JpegSegmentType { - /** APP0 JPEG segment identifier -- JFIF data (also JFXX apparently). */ + /** APP0 JPEG segment identifier. Commonly contains JFIF, JFXX. */ APP0((byte)0xE0, true), - /** APP1 JPEG segment identifier -- where Exif data is kept. XMP data is also kept in here, though usually in a second instance. */ + /** APP1 JPEG segment identifier. Commonly contains Exif. XMP data is also kept in here, though usually in a second instance. */ APP1((byte)0xE1, true), - /** APP2 JPEG segment identifier. */ + /** APP2 JPEG segment identifier. Commonly contains ICC. */ APP2((byte)0xE2, true), @@ -64,5 +69,5 @@ APP9((byte)0xE9, true), - /** APPA (App10) JPEG segment identifier -- can hold Unicode comments. */ + /** APPA (App10) JPEG segment identifier. Can contain Unicode comments, though {@link JpegSegmentType#COM} is more commonly used for comments. */ APPA((byte)0xEA, true), @@ -73,8 +78,8 @@ APPC((byte)0xEC, true), - /** APPD (App13) JPEG segment identifier -- IPTC data in here. */ + /** APPD (App13) JPEG segment identifier. Commonly contains IPTC, Photoshop data. */ APPD((byte)0xED, true), - /** APPE (App14) JPEG segment identifier. */ + /** APPE (App14) JPEG segment identifier. Commonly contains Adobe data. */ APPE((byte)0xEE, true), Index: trunk/src/com/drew/imaging/jpeg/package.html =================================================================== --- trunk/src/com/drew/imaging/jpeg/package.html (revision 8243) +++ trunk/src/com/drew/imaging/jpeg/package.html (revision 10862) @@ -1,4 +1,4 @@