Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java Wed Oct 30 20:02:27 2013 @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Random; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.Imaging; @@ -96,7 +96,7 @@ public class PngWriteReadTest extends Im final int[][] smallAscendingPixels = getAscendingRawData(256, 256); final byte[] pngBytes = Imaging.writeImageToBytes( imageDataToBufferedImage(smallAscendingPixels), - ImageFormat.PNG, null); + ImageFormats.PNG, null); assertTrue(Imaging.getImageInfo(pngBytes).isTransparent()); } @@ -137,7 +137,7 @@ public class PngWriteReadTest extends Im // Boolean.TRUE); final byte bytes[] = Imaging.writeImageToBytes(srcImage, - ImageFormat.PNG, writeParams); + ImageFormats.PNG, writeParams); // Debug.debug("bytes", bytes);
Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java Wed Oct 30 20:02:27 2013 @@ -20,7 +20,7 @@ import java.io.File; import java.io.IOException; import java.util.List; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.ImagingTest; @@ -28,8 +28,8 @@ import org.apache.commons.imaging.Imagin public abstract class PsdBaseTest extends ImagingTest { private static boolean isPsd(final File file) throws IOException, ImageReadException { - final ImageFormat format = Imaging.guessFormat(file); - return format == ImageFormat.PSD; + final ImageFormats format = Imaging.guessFormat(file); + return format == ImageFormats.PSD; } private static final ImageFilter IMAGE_FILTER = new ImageFilter() { Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java Wed Oct 30 20:02:27 2013 @@ -20,7 +20,7 @@ import java.io.File; import java.io.IOException; import java.util.List; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.ImagingTest; @@ -28,8 +28,8 @@ import org.apache.commons.imaging.Imagin public abstract class RgbeBaseTest extends ImagingTest { private static boolean isRgbe(final File file) throws IOException, ImageReadException { - final ImageFormat format = Imaging.guessFormat(file); - return format == ImageFormat.RGBE; + final ImageFormats format = Imaging.guessFormat(file); + return format == ImageFormats.RGBE; } private static final ImageFilter IMAGE_FILTER = new ImageFilter() { Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java Wed Oct 30 20:02:27 2013 @@ -21,7 +21,7 @@ import java.io.File; import java.io.IOException; import java.util.List; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.ImagingTest; @@ -30,8 +30,8 @@ public abstract class TiffBaseTest exten private static boolean isTiff(final File file) throws IOException, ImageReadException { - final ImageFormat format = Imaging.guessFormat(file); - return format == ImageFormat.TIFF; + final ImageFormats format = Imaging.guessFormat(file); + return format == ImageFormats.TIFF; } private static final ImageFilter imageFilter = new ImageFilter() { Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java Wed Oct 30 20:02:27 2013 @@ -21,7 +21,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.util.HashMap; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.Imaging; @@ -175,7 +175,7 @@ public class TiffCcittTest extends TiffB params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_1D); final byte[] compressed = Imaging.writeImageToBytes(image, - ImageFormat.TIFF, params); + ImageFormats.TIFF, params); final BufferedImage result = Imaging.getBufferedImage(compressed); compareImages(image, result); } catch (final ImageWriteException ex) { @@ -195,7 +195,7 @@ public class TiffCcittTest extends TiffB TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 0); final byte[] compressed = Imaging.writeImageToBytes(image, - ImageFormat.TIFF, params); + ImageFormats.TIFF, params); final BufferedImage result = Imaging.getBufferedImage(compressed); compareImages(image, result); } catch (final ImageWriteException ex) { @@ -215,7 +215,7 @@ public class TiffCcittTest extends TiffB TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 4); final byte[] compressed = Imaging.writeImageToBytes(image, - ImageFormat.TIFF, params); + ImageFormats.TIFF, params); final BufferedImage result = Imaging.getBufferedImage(compressed); compareImages(image, result); } catch (final ImageWriteException ex) { @@ -235,7 +235,7 @@ public class TiffCcittTest extends TiffB TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 1); final byte[] compressed = Imaging.writeImageToBytes(image, - ImageFormat.TIFF, params); + ImageFormats.TIFF, params); final BufferedImage result = Imaging.getBufferedImage(compressed); compareImages(image, result); } catch (final ImageWriteException ex) { @@ -255,7 +255,7 @@ public class TiffCcittTest extends TiffB TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3); params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 5); final byte[] compressed = Imaging.writeImageToBytes(image, - ImageFormat.TIFF, params); + ImageFormats.TIFF, params); final BufferedImage result = Imaging.getBufferedImage(compressed); compareImages(image, result); } catch (final ImageWriteException ex) { @@ -274,7 +274,7 @@ public class TiffCcittTest extends TiffB params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4); final byte[] compressed = Imaging.writeImageToBytes(image, - ImageFormat.TIFF, params); + ImageFormats.TIFF, params); final BufferedImage result = Imaging.getBufferedImage(compressed); compareImages(image, result); } catch (final ImageWriteException ex) { Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java Wed Oct 30 20:02:27 2013 @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.IImageMetadata; @@ -52,7 +52,7 @@ public class TiffRoundtripTest extends T final File tempFile = createTempFile(imageFile.getName() + ".", ".tif"); final Map<String,Object> params = new HashMap<String,Object>(); - Imaging.writeImage(image, tempFile, ImageFormat.TIFF, + Imaging.writeImage(image, tempFile, ImageFormats.TIFF, params); image = null; Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java Wed Oct 30 20:02:27 2013 @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.ImagingTest; import org.apache.commons.imaging.util.Debug; @@ -47,11 +47,11 @@ public class XmpUpdateTest extends Imagi Debug.debug("imageFile", imageFile); Debug.debug(); - final ImageFormat imageFormat = Imaging.guessFormat(imageFile); + final ImageFormats imageFormat = Imaging.guessFormat(imageFile); String xmpXml = Imaging.getXmpXml(imageFile); if (null == xmpXml - && imageFormat.equals(ImageFormat.GIF)) { + && imageFormat.equals(ImageFormats.GIF)) { xmpXml = "temporary test until I can locate a GIF with XMP in the wild."; } if (null == xmpXml) { @@ -60,15 +60,15 @@ public class XmpUpdateTest extends Imagi assertNotNull(xmpXml); - if (imageFormat.equals(ImageFormat.PNG)) { /* + if (imageFormat.equals(ImageFormats.PNG)) { /* * do * nothing */ - } else if (imageFormat.equals(ImageFormat.TIFF)) { /* + } else if (imageFormat.equals(ImageFormats.TIFF)) { /* * do * nothing */ - } else if (imageFormat.equals(ImageFormat.GIF)) { /* + } else if (imageFormat.equals(ImageFormats.GIF)) { /* * do * nothing */ Modified: commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java?rev=1537262&r1=1537261&r2=1537262&view=diff ============================================================================== --- commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java (original) +++ commons/proper/imaging/branches/IMAGING-120/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java Wed Oct 30 20:02:27 2013 @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; @@ -43,14 +43,14 @@ public class RoundtripTest extends Imagi private static class FormatInfo { - public final ImageFormat format; + public final ImageFormats format; public final boolean canRead; public final boolean canWrite; public final int colorSupport; public final boolean identicalSecondWrite; public final boolean preservesResolution; - public FormatInfo(final ImageFormat format, final boolean canRead, + public FormatInfo(final ImageFormats format, final boolean canRead, final boolean canWrite, final int colorSupport, final boolean identicalSecondWrite, final boolean preservesResolution) { @@ -64,41 +64,41 @@ public class RoundtripTest extends Imagi } private static final FormatInfo FORMAT_INFOS[] = { // - new FormatInfo(ImageFormat.PNG, true, true, + new FormatInfo(ImageFormats.PNG, true, true, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.GIF, true, true, + new FormatInfo(ImageFormats.GIF, true, true, COLOR_LIMITED_INDEX, true, false), // - new FormatInfo(ImageFormat.ICO, true, true, + new FormatInfo(ImageFormats.ICO, true, true, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.TIFF, true, true, + new FormatInfo(ImageFormats.TIFF, true, true, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.JPEG, true, false, + new FormatInfo(ImageFormats.JPEG, true, false, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.BMP, true, true, + new FormatInfo(ImageFormats.BMP, true, true, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.PSD, true, false, + new FormatInfo(ImageFormats.PSD, true, false, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.PBM, true, true, + new FormatInfo(ImageFormats.PBM, true, true, COLOR_BITMAP, true, false), // - new FormatInfo(ImageFormat.PGM, true, true, + new FormatInfo(ImageFormats.PGM, true, true, COLOR_GRAYSCALE, true, false), // - new FormatInfo(ImageFormat.PPM, true, true, + new FormatInfo(ImageFormats.PPM, true, true, COLOR_FULL_RGB, true, false), // - new FormatInfo(ImageFormat.PAM, true, true, + new FormatInfo(ImageFormats.PAM, true, true, COLOR_FULL_RGB, true, false),// // new FormatInfo(ImageFormat.IMAGE_FORMAT_PNM, true, true, // COLOR_FULL_RGB, true), // - new FormatInfo(ImageFormat.TGA, false, false, + new FormatInfo(ImageFormats.TGA, false, false, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.WBMP, true, true, + new FormatInfo(ImageFormats.WBMP, true, true, COLOR_BITMAP, true, false), // - new FormatInfo(ImageFormat.PCX, true, true, + new FormatInfo(ImageFormats.PCX, true, true, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.DCX, true, true, + new FormatInfo(ImageFormats.DCX, true, true, COLOR_FULL_RGB, true, true), // - new FormatInfo(ImageFormat.XBM, true, true, + new FormatInfo(ImageFormats.XBM, true, true, COLOR_BITMAP, false, false), // - new FormatInfo(ImageFormat.XPM, true, true, + new FormatInfo(ImageFormats.XPM, true, true, COLOR_FULL_RGB, false, false), // };
