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

Code clean-up.

Browse Source
This commit is contained in:
Harald Kuhr 2012-02-01 15:55:22 +01:00
parent 6c6c08a8f5
commit ed441a7d6a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
imageio/imageio-icns/src/main/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReader.java
View File

@ -419,6 +419,7 @@ public final class ICNSImageReader extends ImageReaderBase {
} }
private BufferedImage readForeignFormat(int imageIndex, final ImageReadParam param, final IconResource resource) throws IOException { private BufferedImage readForeignFormat(int imageIndex, final ImageReadParam param, final IconResource resource) throws IOException {
// TODO: Optimize by caching readers that work?
ImageInputStream stream = ImageIO.createImageInputStream(IIOUtil.createStreamAdapter(imageInput, resource.length)); ImageInputStream stream = ImageIO.createImageInputStream(IIOUtil.createStreamAdapter(imageInput, resource.length));
try { try {
@ -588,9 +589,11 @@ public final class ICNSImageReader extends ImageReaderBase {
int numImages = requested != -1 ? requested + 1 : reader.getNumImages(true); int numImages = requested != -1 ? requested + 1 : reader.getNumImages(true);
for (int i = start; i < numImages; i++) { for (int i = start; i < numImages; i++) {
try { try {
long begin = System.currentTimeMillis();
BufferedImage image = reader.read(i); BufferedImage image = reader.read(i);
imagesRead++; imagesRead++;
// System.err.println("image: " + image); // System.err.println("image: " + image);
System.err.println(System.currentTimeMillis() - begin + "ms");
showIt(image, String.format("%s - %d", input.getName(), i)); showIt(image, String.format("%s - %d", input.getName(), i));
} }
catch (IOException e) { catch (IOException e) {

8
imageio/imageio-icns/src/test/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderTest.java
View File

@ -60,16 +60,16 @@ public class ICNSImageReaderTest extends ImageReaderAbstractTestCase {
new Dimension(16, 16), // 24 bit + 8 bit mask new Dimension(16, 16), // 24 bit + 8 bit mask
new Dimension(32, 32), // 24 bit + 8 bit mask new Dimension(32, 32), // 24 bit + 8 bit mask
new Dimension(48, 48), // 24 bit + 8 bit mask new Dimension(48, 48), // 24 bit + 8 bit mask
new Dimension(128, 128) // 24 bit + 8 bit mask new Dimension(128, 128), // 24 bit + 8 bit mask
, new Dimension(256, 256), // JPEG 2000 ic08 new Dimension(256, 256), // JPEG 2000 ic08
new Dimension(512, 512) // JPEG 2000 ic09 new Dimension(512, 512) // JPEG 2000 ic09
), ),
new TestData( new TestData(
getClassLoaderResource("/icns/7zIcon.icns"), // Contains the icnV resource, that isn't an icon getClassLoaderResource("/icns/7zIcon.icns"), // Contains the icnV resource, that isn't an icon
new Dimension(16, 16), // 24 bit + 8 bit mask new Dimension(16, 16), // 24 bit + 8 bit mask
new Dimension(32, 32), // 24 bit + 8 bit mask new Dimension(32, 32), // 24 bit + 8 bit mask
new Dimension(128, 128) // 24 bit + 8 bit mask new Dimension(128, 128), // 24 bit + 8 bit mask
, new Dimension(256, 256), // JPEG 2000 ic08 new Dimension(256, 256), // JPEG 2000 ic08
new Dimension(512, 512) // JPEG 2000 ic09 new Dimension(512, 512) // JPEG 2000 ic09
), ),
new TestData( new TestData(