diff --git a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java index 3af95813..3bbbb97b 100755 --- a/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java +++ b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java @@ -33,6 +33,7 @@ package com.twelvemonkeys.imageio.plugins.svg; import com.twelvemonkeys.image.ImageUtil; import com.twelvemonkeys.imageio.ImageReaderBase; import com.twelvemonkeys.imageio.util.IIOUtil; +import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers; import com.twelvemonkeys.lang.StringUtil; import org.apache.batik.anim.dom.SVGDOMImplementation; @@ -249,7 +250,7 @@ public class SVGImageReader extends ImageReaderBase { } public Iterator getImageTypes(int imageIndex) { - return Collections.singleton(ImageTypeSpecifier.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator(); + return Collections.singleton(ImageTypeSpecifiers.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator(); } /** diff --git a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/Paths.java b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/Paths.java index ba4a3adf..849459d5 100755 --- a/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/Paths.java +++ b/imageio/imageio-clippath/src/main/java/com/twelvemonkeys/imageio/path/Paths.java @@ -42,6 +42,7 @@ import com.twelvemonkeys.imageio.metadata.tiff.TIFF; import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader; import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream; import com.twelvemonkeys.imageio.stream.SubImageInputStream; +import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers; import javax.imageio.*; import javax.imageio.metadata.IIOMetadata; @@ -307,7 +308,7 @@ public final class Paths { throw new IllegalArgumentException("output == null!"); } - ImageTypeSpecifier type = ImageTypeSpecifier.createFromRenderedImage(image); + ImageTypeSpecifier type = ImageTypeSpecifiers.createFromRenderedImage(image); Iterator writers = ImageIO.getImageWriters(type, formatName); if (writers.hasNext()) { diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriter.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriter.java index 9d573a41..4c956f36 100644 --- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriter.java +++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriter.java @@ -32,6 +32,7 @@ package com.twelvemonkeys.imageio.plugins.jpeg; import com.twelvemonkeys.imageio.ImageWriterBase; import com.twelvemonkeys.imageio.metadata.jpeg.JPEG; +import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers; import com.twelvemonkeys.imageio.util.ProgressListenerBase; import javax.imageio.IIOImage; @@ -161,7 +162,7 @@ public final class JPEGImageWriter extends ImageWriterBase { else { // If the image metadata is our substitute, convert it back to native com.sun format if (image.getMetadata() instanceof JPEGImage10Metadata) { - ImageTypeSpecifier type = image.hasRaster() ? null : ImageTypeSpecifier.createFromRenderedImage(image.getRenderedImage()); + ImageTypeSpecifier type = image.hasRaster() ? null : ImageTypeSpecifiers.createFromRenderedImage(image.getRenderedImage()); IIOMetadata nativeMetadata = delegate.getDefaultImageMetadata(type, param); JPEGImage10Metadata metadata = (JPEGImage10Metadata) image.getMetadata(); @@ -185,7 +186,7 @@ public final class JPEGImageWriter extends ImageWriterBase { boolean overrideDestination = param != null && param.getDestinationType() != null; ImageTypeSpecifier destinationType = overrideDestination ? param.getDestinationType() - : ImageTypeSpecifier.createFromRenderedImage(renderedImage); + : ImageTypeSpecifiers.createFromRenderedImage(renderedImage); ColorSpace cmykCS = destinationType.getColorModel().getColorSpace();