From: <svn...@os...> - 2012-05-16 13:53:37
|
Author: aaime Date: 2012-05-16 06:53:25 -0700 (Wed, 16 May 2012) New Revision: 38739 Modified: branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java Log: Make this test work on OSX Modified: branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java =================================================================== --- branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java 2012-05-16 12:32:48 UTC (rev 38738) +++ branches/2.7.x/modules/library/coverage/src/test/java/org/geotools/image/ImageWorkerTest.java 2012-05-16 13:53:25 UTC (rev 38739) @@ -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; /** @@ -400,7 +405,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()); |