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

Fixed possible NPEs in Metadata.

Browse Source
This commit is contained in:
Harald Kuhr 2015-02-12 16:17:02 +01:00
parent ecfcea98df
commit 7354b1f8c7
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
imageio/imageio-bmp/src/main/java/com/twelvemonkeys/imageio/plugins/bmp/BMPMetadata.java
View File

@ -34,7 +34,6 @@ import org.w3c.dom.Node;
import javax.imageio.metadata.IIOMetadata; import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataFormatImpl; import javax.imageio.metadata.IIOMetadataFormatImpl;
import javax.imageio.metadata.IIOMetadataNode; import javax.imageio.metadata.IIOMetadataNode;
import java.awt.image.IndexColorModel;
/** /**
* BMPMetadata. * BMPMetadata.
@ -58,10 +57,10 @@ final class BMPMetadata extends IIOMetadata {
} }
@Override public Node getAsTree(final String formatName) { @Override public Node getAsTree(final String formatName) {
if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) { if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
return getStandardTree(); return getStandardTree();
} }
else if (formatName.equals(nativeMetadataFormatName)) { else if (nativeMetadataFormatName.equals(formatName)) {
return getNativeTree(); return getNativeTree();
} }
else { else {

2
imageio/imageio-pcx/src/main/java/com/twelvemonkeys/imageio/plugins/pcx/PCXMetadata.java
View File

@ -53,7 +53,7 @@ final class PCXMetadata extends IIOMetadata {
} }
@Override public Node getAsTree(final String formatName) { @Override public Node getAsTree(final String formatName) {
if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) { if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
return getStandardTree(); return getStandardTree();
} }
else { else {

2
imageio/imageio-pnm/src/main/java/com/twelvemonkeys/imageio/plugins/pnm/PNMMetadata.java
View File

@ -52,7 +52,7 @@ final class PNMMetadata extends IIOMetadata {
} }
@Override public Node getAsTree(final String formatName) { @Override public Node getAsTree(final String formatName) {
if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) { if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
return getStandardTree(); return getStandardTree();
} }
else { else {

2
imageio/imageio-sgi/src/main/java/com/twelvemonkeys/imageio/plugins/sgi/SGIMetadata.java
View File

@ -49,7 +49,7 @@ final class SGIMetadata extends IIOMetadata {
} }
@Override public Node getAsTree(final String formatName) { @Override public Node getAsTree(final String formatName) {
if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) { if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
return getStandardTree(); return getStandardTree();
} }
else { else {

2
imageio/imageio-tga/src/main/java/com/twelvemonkeys/imageio/plugins/tga/TGAMetadata.java
View File

@ -50,7 +50,7 @@ final class TGAMetadata extends IIOMetadata {
} }
@Override public Node getAsTree(final String formatName) { @Override public Node getAsTree(final String formatName) {
if (formatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) { if (IIOMetadataFormatImpl.standardMetadataFormatName.equals(formatName)) {
return getStandardTree(); return getStandardTree();
} }
else { else {