You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/11/01 19:43:54 UTC
svn commit: r1538022 -
/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
Author: ggregory
Date: Fri Nov 1 18:43:53 2013
New Revision: 1538022
URL: http://svn.apache.org/r1538022
Log:
Statement unnecessarily nested within else clause.
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1538022&r1=1538021&r2=1538022&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Fri Nov 1 18:43:53 2013
@@ -540,9 +540,8 @@ public class IcoImageParser extends Imag
final BufferedImage bufferedImage = Imaging.getBufferedImage(iconData);
final PNGIconData pngIconData = new PNGIconData(fIconInfo, bufferedImage);
return pngIconData;
- } else {
- return readBitmapIconData(iconData, fIconInfo);
}
+ return readBitmapIconData(iconData, fIconInfo);
}
private static class ImageContents {
@@ -603,9 +602,8 @@ public class IcoImageParser extends Imag
final FileHeader fileHeader = contents.fileHeader;
if (fileHeader.iconCount > 0) {
return contents.iconDatas[0].readBufferedImage();
- } else {
- throw new ImageReadException("No icons in ICO file");
}
+ throw new ImageReadException("No icons in ICO file");
}
@Override