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

TMI-JPEG: Regression fix for NPE in metadata if delegate returns null metadata.

Browse Source
This commit is contained in:
Harald Kuhr 2013-09-28 12:32:01 +02:00
parent 1acc04eeaf
commit c8061eb0c4
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1006,6 +1006,7 @@ public class JPEGImageReader extends ImageReaderBase {
public IIOMetadata getImageMetadata(int imageIndex) throws IOException { public IIOMetadata getImageMetadata(int imageIndex) throws IOException {
IIOMetadata metadata = delegate.getImageMetadata(imageIndex); IIOMetadata metadata = delegate.getImageMetadata(imageIndex);
if (metadata != null) {
String format = metadata.getNativeMetadataFormatName(); String format = metadata.getNativeMetadataFormatName();
IIOMetadataNode tree = (IIOMetadataNode) metadata.getAsTree(format); IIOMetadataNode tree = (IIOMetadataNode) metadata.getAsTree(format);
Node jpegVariety = tree.getElementsByTagName("JPEGvariety").item(0); Node jpegVariety = tree.getElementsByTagName("JPEGvariety").item(0);
@ -1040,6 +1041,7 @@ public class JPEGImageReader extends ImageReaderBase {
// new XMLSerializer(System.err, System.getProperty("file.encoding")).serialize(tree, false); // new XMLSerializer(System.err, System.getProperty("file.encoding")).serialize(tree, false);
metadata.mergeTree(format, tree); metadata.mergeTree(format, tree);
}
return metadata; return metadata;
} }