diff --git a/pom.xml b/pom.xml index c3b4303..3b815b1 100644 --- a/pom.xml +++ b/pom.xml @@ -69,24 +69,23 @@ - - com.sun.media - jai_imageio - 1.1 - + + + + + - com.twelvemonkeys.imageio imageio-jpeg - 3.3.2 + 3.4 com.twelvemonkeys.imageio imageio-tiff - 3.3.2 + 3.4 diff --git a/src/main/java/eu/transkribus/interfaces/types/util/ImageUtils.java b/src/main/java/eu/transkribus/interfaces/types/util/ImageUtils.java index 42668ee..daf9c52 100644 --- a/src/main/java/eu/transkribus/interfaces/types/util/ImageUtils.java +++ b/src/main/java/eu/transkribus/interfaces/types/util/ImageUtils.java @@ -57,10 +57,10 @@ public class ImageUtils { //Store instances of plugins to be registered AND unregistered. Not doing this will leave a mess in IIORegistry/Tomcat after hot (un)deployment static { //tiff writers - iioWriterList.add(new com.sun.media.imageioimpl.plugins.tiff.TIFFImageWriterSpi()); +// iioWriterList.add(new com.sun.media.imageioimpl.plugins.tiff.TIFFImageWriterSpi()); iioWriterList.add(new com.twelvemonkeys.imageio.plugins.tiff.TIFFImageWriterSpi()); //tiff readers - iioReaderList.add(new com.sun.media.imageioimpl.plugins.tiff.TIFFImageReaderSpi()); +// iioReaderList.add(new com.sun.media.imageioimpl.plugins.tiff.TIFFImageReaderSpi()); iioReaderList.add(new com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReaderSpi()); } @@ -148,34 +148,6 @@ public static BufferedImage read(File f) throws IOException { return bi; } -// public static ImageInputStream createImageInputStream(Object input) throws IOException { -// if (input == null) { -// throw new IllegalArgumentException("input == null!"); -// } -// -// Iterator iter; -// // Ensure category is present -// try { -// iter = IIORegistry.getDefaultInstance().getServiceProviders(ImageInputStreamSpi.class, -// true); -// } catch (IllegalArgumentException e) { -// return null; -// } -// -// while (iter.hasNext()) { -// ImageInputStreamSpi spi = (ImageInputStreamSpi)iter.next(); -// if (spi.getInputClass().isInstance(input)) { -// try { -// return spi.createInputStreamInstance(input); -// } catch (IOException e) { -// throw new IIOException("Can't create cache file!", e); -// } -// } -// } -// -// return null; -// } - /** * Alternative implementation of ImageIO::read.
* If one image reader claims to be able to read an ImageInputStream but fails then,