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

JPEG Exif parsing optimization.

Browse Source
This commit is contained in:
Harald Kuhr 2019-08-07 15:47:33 +02:00
parent caef9b6a9e
commit d7fbd6594e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
View File

@ -42,6 +42,7 @@ import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil;
import com.twelvemonkeys.imageio.metadata.tiff.TIFF; import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader; import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader;
import com.twelvemonkeys.imageio.stream.BufferedImageInputStream; import com.twelvemonkeys.imageio.stream.BufferedImageInputStream;
import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
import com.twelvemonkeys.imageio.stream.SubImageInputStream; import com.twelvemonkeys.imageio.stream.SubImageInputStream;
import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers; import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
import com.twelvemonkeys.imageio.util.ProgressListenerBase; import com.twelvemonkeys.imageio.util.ProgressListenerBase;
@ -63,8 +64,8 @@ import java.awt.color.ICC_ColorSpace;
import java.awt.color.ICC_Profile; import java.awt.color.ICC_Profile;
import java.awt.image.*; import java.awt.image.*;
import java.io.*; import java.io.*;
import java.util.*;
import java.util.List; import java.util.List;
import java.util.*;
/** /**
* A JPEG {@code ImageReader} implementation based on the JRE {@code JPEGImageReader}, * A JPEG {@code ImageReader} implementation based on the JRE {@code JPEGImageReader},
@ -1120,14 +1121,15 @@ public final class JPEGImageReader extends ImageReaderBase {
List<Application> exifSegments = getAppSegments(JPEG.APP1, "Exif"); List<Application> exifSegments = getAppSegments(JPEG.APP1, "Exif");
if (!exifSegments.isEmpty()) { if (!exifSegments.isEmpty()) {
Application exif = exifSegments.get(0); Application exif = exifSegments.get(0);
InputStream data = exif.data();
if (data.read() == -1) { // Identifier is "Exif\0" + 1 byte pad
// Pad int offset = exif.identifier.length() + 2;
if (exif.data.length <= offset) {
processWarningOccurred("Exif chunk has no data."); processWarningOccurred("Exif chunk has no data.");
} }
else { else {
ImageInputStream stream = new MemoryCacheImageInputStream(data); ImageInputStream stream = new ByteArrayImageInputStream(exif.data, offset, exif.data.length - offset);
CompoundDirectory exifMetadata = (CompoundDirectory) new TIFFReader().read(stream); CompoundDirectory exifMetadata = (CompoundDirectory) new TIFFReader().read(stream);
if (exifMetadata.directoryCount() == 2) { if (exifMetadata.directoryCount() == 2) {