[Geotools-commits] svn - r38744 - trunk/modules/library/coverage/src/test/java/org/geotools/image

[<svn...@os...>]

Author: aaime
Date: 2012-05-17 23:05:12 -0700 (Thu, 17 May 2012)
New Revision: 38744

Modified:
   trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
Log:
Make the test work on Jody's OSX (it apparently worked fine on Justin's one?)

Modified: trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java
===================================================================
--- trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2012-05-17 17:33:16 UTC (rev 38743)
+++ trunk/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java	2012-05-18 06:05:12 UTC (rev 38744)
@@ -18,6 +18,8 @@
 
 import static org.junit.Assert.*;
 
+import it.geosolutions.imageioimpl.plugins.tiff.TIFFImageReaderSpi;
+
 import java.awt.Color;
 import java.awt.Transparency;
 import java.awt.color.ColorSpace;
@@ -41,6 +43,8 @@
 import java.util.zip.GZIPInputStream;
 
 import javax.imageio.ImageIO;
+import javax.imageio.ImageReader;
+import javax.imageio.stream.ImageInputStream;
 import javax.media.jai.ImageLayout;
 import javax.media.jai.JAI;
 import javax.media.jai.RasterFactory;
@@ -56,6 +60,7 @@
 import org.junit.Test;
 
 import com.sun.media.imageioimpl.common.PackageUtil;
+import com.sun.media.imageioimpl.plugins.tiff.TIFFImageReader;
 
 
 /**
@@ -401,7 +406,10 @@
         InputStream gzippedStream = ImageWorkerTest.class.getResource("test-data/sf-sfdem.tif.gz").openStream();
         GZIPInputStream is = new GZIPInputStream(gzippedStream);
         try {
-            BufferedImage bi = ImageIO.read(is);
+            ImageInputStream iis = ImageIO.createImageInputStream(is);
+            ImageReader reader = new TIFFImageReaderSpi().createReaderInstance(iis);
+            reader.setInput(iis);
+            BufferedImage bi = reader.read(0);
             IndexColorModel icm = (IndexColorModel) bi.getColorModel();
             assertEquals(65536, icm.getMapSize());