You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2013/10/30 23:17:52 UTC
svn commit: r1537329 - in /commons/proper/imaging/trunk: ./
src/main/java/org/apache/commons/imaging/
src/main/java/org/apache/commons/imaging/formats/bmp/
src/main/java/org/apache/commons/imaging/formats/dcx/
src/main/java/org/apache/commons/imaging/f...
Author: mbenson
Date: Wed Oct 30 22:17:51 2013
New Revision: 1537329
URL: http://svn.apache.org/r1537329
Log:
[IMAGING-120] Extract interface from ImageFormat; specifically, converted 'ImageFormat' as the interface name with the enumerated instances in 'ImageFormats'
Added:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageFormat.java
- copied unchanged from r1537328, commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormat.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageFormats.java
- copied unchanged from r1537328, commons/proper/imaging/branches/IMAGING-120/src/main/java/org/apache/commons/imaging/ImageFormats.java
Modified:
commons/proper/imaging/trunk/ (props changed)
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
Propchange: commons/proper/imaging/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 30 22:17:51 2013
@@ -0,0 +1,2 @@
+/commons/proper/imaging/branches/IMAGING-120:1537257-1537328
+/commons/proper/imaging/trunk:1537243-1537256
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java Wed Oct 30 22:17:51 2013
@@ -127,7 +127,7 @@ public class ImageInfo {
* Returns ImageFormat.IMAGE_FORMAT_UNKNOWN if format is unknown.
*
* @return A constant defined in ImageFormat.
- * @see ImageFormat
+ * @see ImageFormats
*/
public ImageFormat getFormat() {
return format;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java Wed Oct 30 22:17:51 2013
@@ -223,7 +223,7 @@ public abstract class Imaging implements
throws ImageReadException, IOException {
if (byteSource==null) {
- return ImageFormat.UNKNOWN;
+ return ImageFormats.UNKNOWN;
}
InputStream is = null;
@@ -244,7 +244,7 @@ public abstract class Imaging implements
if (compareBytePair(MAGIC_NUMBERS_GIF, bytePair)) {
canThrow = true;
- return ImageFormat.GIF;
+ return ImageFormats.GIF;
}
// else if (b1 == 0x00 && b2 == 0x00) // too similar to TGA
// {
@@ -252,43 +252,43 @@ public abstract class Imaging implements
// }
else if (compareBytePair(MAGIC_NUMBERS_PNG, bytePair)) {
canThrow = true;
- return ImageFormat.PNG;
+ return ImageFormats.PNG;
} else if (compareBytePair(MAGIC_NUMBERS_JPEG, bytePair)) {
canThrow = true;
- return ImageFormat.JPEG;
+ return ImageFormats.JPEG;
} else if (compareBytePair(MAGIC_NUMBERS_BMP, bytePair)) {
canThrow = true;
- return ImageFormat.BMP;
+ return ImageFormats.BMP;
} else if (compareBytePair(MAGIC_NUMBERS_TIFF_MOTOROLA, bytePair)) {
canThrow = true;
- return ImageFormat.TIFF;
+ return ImageFormats.TIFF;
} else if (compareBytePair(MAGIC_NUMBERS_TIFF_INTEL, bytePair)) {
canThrow = true;
- return ImageFormat.TIFF;
+ return ImageFormats.TIFF;
} else if (compareBytePair(MAGIC_NUMBERS_PSD, bytePair)) {
canThrow = true;
- return ImageFormat.PSD;
+ return ImageFormats.PSD;
} else if (compareBytePair(MAGIC_NUMBERS_PAM, bytePair)) {
canThrow = true;
- return ImageFormat.PAM;
+ return ImageFormats.PAM;
} else if (compareBytePair(MAGIC_NUMBERS_PBM_A, bytePair)) {
canThrow = true;
- return ImageFormat.PBM;
+ return ImageFormats.PBM;
} else if (compareBytePair(MAGIC_NUMBERS_PBM_B, bytePair)) {
canThrow = true;
- return ImageFormat.PBM;
+ return ImageFormats.PBM;
} else if (compareBytePair(MAGIC_NUMBERS_PGM_A, bytePair)) {
canThrow = true;
- return ImageFormat.PGM;
+ return ImageFormats.PGM;
} else if (compareBytePair(MAGIC_NUMBERS_PGM_B, bytePair)) {
canThrow = true;
- return ImageFormat.PGM;
+ return ImageFormats.PGM;
} else if (compareBytePair(MAGIC_NUMBERS_PPM_A, bytePair)) {
canThrow = true;
- return ImageFormat.PPM;
+ return ImageFormats.PPM;
} else if (compareBytePair(MAGIC_NUMBERS_PPM_B, bytePair)) {
canThrow = true;
- return ImageFormat.PPM;
+ return ImageFormats.PPM;
} else if (compareBytePair(MAGIC_NUMBERS_JBIG2_1, bytePair)) {
final int i3 = is.read();
final int i4 = is.read();
@@ -302,20 +302,20 @@ public abstract class Imaging implements
final int bytePair2[] = { b3, b4, };
if (compareBytePair(MAGIC_NUMBERS_JBIG2_2, bytePair2)) {
canThrow = true;
- return ImageFormat.JBIG2;
+ return ImageFormats.JBIG2;
}
} else if (compareBytePair(MAGIC_NUMBERS_ICNS, bytePair)) {
canThrow = true;
- return ImageFormat.ICNS;
+ return ImageFormats.ICNS;
} else if (compareBytePair(MAGIC_NUMBERS_DCX, bytePair)) {
canThrow = true;
- return ImageFormat.DCX;
+ return ImageFormats.DCX;
} else if (compareBytePair(MAGIC_NUMBERS_RGBE, bytePair)) {
canThrow = true;
- return ImageFormat.RGBE;
+ return ImageFormats.RGBE;
}
canThrow = true;
- return ImageFormat.UNKNOWN;
+ return ImageFormats.UNKNOWN;
} finally {
IoUtils.closeQuietly(canThrow, is);
}
@@ -708,7 +708,7 @@ public abstract class Imaging implements
private static ImageParser getImageParser(final ByteSource byteSource)
throws ImageReadException, IOException {
final ImageFormat format = guessFormat(byteSource);
- if (!format.equals(ImageFormat.UNKNOWN)) {
+ if (!format.equals(ImageFormats.UNKNOWN)) {
final ImageParser imageParsers[] = ImageParser.getAllImageParsers();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImagingConstants.java Wed Oct 30 22:17:51 2013
@@ -52,7 +52,7 @@ public interface ImagingConstants {
* ImageFormat.IMAGE_FORMAT_PNG.
* <p>
*
- * @see org.apache.commons.imaging.ImageFormat
+ * @see org.apache.commons.imaging.ImageFormats
*/
public static final String PARAM_KEY_FORMAT = "FORMAT";
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Wed Oct 30 22:17:51 2013
@@ -31,6 +31,7 @@ import java.util.Map;
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -80,7 +81,7 @@ public class BmpImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.BMP, //
+ return new ImageFormat[] { ImageFormats.BMP, //
};
}
@@ -632,7 +633,7 @@ public class BmpImageParser extends Imag
// TODO: comments...
final int bitsPerPixel = bhi.bitsPerPixel;
- final ImageFormat format = ImageFormat.BMP;
+ final ImageFormat format = ImageFormats.BMP;
final String name = "BMP Windows Bitmap";
final String mimeType = "image/x-ms-bmp";
// we ought to count images, but don't yet.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java Wed Oct 30 22:17:51 2013
@@ -29,6 +29,7 @@ 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.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -71,7 +72,7 @@ public class DcxImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
return new ImageFormat[] {
- ImageFormat.DCX, //
+ ImageFormats.DCX, //
};
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Wed Oct 30 22:17:51 2013
@@ -32,6 +32,7 @@ import java.util.Map;
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -75,7 +76,7 @@ public class GifImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.GIF, //
+ return new ImageFormat[] { ImageFormats.GIF, //
};
}
@@ -564,7 +565,7 @@ public class GifImageParser extends Imag
final List<String> comments = getComments(blocks.blocks);
final int bitsPerPixel = (bhi.colorResolution + 1);
- final ImageFormat format = ImageFormat.GIF;
+ final ImageFormat format = ImageFormats.GIF;
final String formatName = "GIF Graphics Interchange Format";
final String mimeType = "image/gif";
// we ought to count images, but don't yet.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Wed Oct 30 22:17:51 2013
@@ -29,6 +29,7 @@ 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.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -68,7 +69,7 @@ public class IcnsImageParser extends Ima
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.ICNS };
+ return new ImageFormat[] { ImageFormats.ICNS };
}
@Override
@@ -107,7 +108,7 @@ public class IcnsImageParser extends Ima
}
final BufferedImage image0 = images.get(0);
return new ImageInfo("Icns", 32, new ArrayList<String>(),
- ImageFormat.ICNS, "ICNS Apple Icon Image",
+ ImageFormats.ICNS, "ICNS Apple Icon Image",
image0.getHeight(), "image/x-icns", images.size(), 0, 0, 0, 0,
image0.getWidth(), false, true, false,
ImageInfo.COLOR_TYPE_RGB,
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Wed Oct 30 22:17:51 2013
@@ -31,6 +31,7 @@ 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.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -73,7 +74,7 @@ public class IcoImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.ICO, //
+ return new ImageFormat[] { ImageFormats.ICO, //
};
}
@@ -535,7 +536,7 @@ public class IcoImageParser extends Imag
private IconData readIconData(final byte[] iconData, final IconInfo fIconInfo)
throws ImageReadException, IOException {
final ImageFormat imageFormat = Imaging.guessFormat(iconData);
- if (imageFormat.equals(ImageFormat.PNG)) {
+ if (imageFormat.equals(ImageFormats.PNG)) {
final BufferedImage bufferedImage = Imaging.getBufferedImage(iconData);
final PNGIconData pngIconData = new PNGIconData(fIconInfo, bufferedImage);
return pngIconData;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java Wed Oct 30 22:17:51 2013
@@ -31,6 +31,7 @@ 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.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -65,7 +66,7 @@ public class JpegImageParser extends Ima
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.JPEG, //
+ return new ImageFormat[] { ImageFormats.JPEG, //
};
}
@@ -783,7 +784,7 @@ public class JpegImageParser extends Ima
final int Precision = fSOFNSegment.precision;
final int BitsPerPixel = Number_of_components * Precision;
- final ImageFormat Format = ImageFormat.JPEG;
+ final ImageFormat Format = ImageFormats.JPEG;
final String FormatName = "JPEG (Joint Photographic Experts Group) Format";
final String MimeType = "image/jpeg";
// we ought to count images, but don't yet.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java Wed Oct 30 22:17:51 2013
@@ -39,6 +39,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -85,7 +86,7 @@ public class PcxImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.PCX, //
+ return new ImageFormat[] { ImageFormats.PCX, //
};
}
@@ -109,7 +110,7 @@ public class PcxImageParser extends Imag
"PCX",
pcxHeader.nPlanes * pcxHeader.bitsPerPixel,
new ArrayList<String>(),
- ImageFormat.PCX,
+ ImageFormats.PCX,
"ZSoft PCX Image",
size.height,
"image/x-pcx",
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java Wed Oct 30 22:17:51 2013
@@ -36,6 +36,7 @@ import java.util.zip.InflaterInputStream
import org.apache.commons.imaging.ColorTools;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -89,7 +90,7 @@ public class PngImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.PNG, //
+ return new ImageFormat[] { ImageFormats.PNG, //
};
}
@@ -556,7 +557,7 @@ public class PngImageParser extends Imag
final int BitsPerPixel = pngChunkIHDR.bitDepth
* samplesPerPixel(pngChunkIHDR.colorType);
- final ImageFormat Format = ImageFormat.PNG;
+ final ImageFormat Format = ImageFormats.PNG;
final String FormatName = "PNG Portable Network Graphics";
final int Height = pngChunkIHDR.height;
final String MimeType = "image/png";
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PamFileInfo.java Wed Oct 30 22:17:51 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageReadException;
@@ -79,7 +80,7 @@ public class PamFileInfo extends FileInf
@Override
public ImageFormat getImageType() {
- return ImageFormat.PAM;
+ return ImageFormats.PAM;
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java Wed Oct 30 22:17:51 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
public class PbmFileInfo extends FileInfo {
@@ -44,7 +45,7 @@ public class PbmFileInfo extends FileInf
@Override
public ImageFormat getImageType() {
- return ImageFormat.PBM;
+ return ImageFormats.PBM;
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java Wed Oct 30 22:17:51 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageReadException;
@@ -63,7 +64,7 @@ public class PgmFileInfo extends FileInf
@Override
public ImageFormat getImageType() {
- return ImageFormat.PGM;
+ return ImageFormats.PGM;
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java Wed Oct 30 22:17:51 2013
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.StringTokenizer;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -71,11 +72,11 @@ public class PnmImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
return new ImageFormat[] {
- ImageFormat.PBM, //
- ImageFormat.PGM, //
- ImageFormat.PPM, //
- ImageFormat.PNM,
- ImageFormat.PAM
+ ImageFormats.PBM, //
+ ImageFormats.PGM, //
+ ImageFormats.PPM, //
+ ImageFormats.PNM,
+ ImageFormats.PAM
};
}
@@ -335,13 +336,13 @@ public class PnmImageParser extends Imag
final Object subtype = params.get(PARAM_KEY_FORMAT);
if (subtype != null) {
- if (subtype.equals(ImageFormat.PBM)) {
+ if (subtype.equals(ImageFormats.PBM)) {
writer = new PbmWriter(useRawbits);
- } else if (subtype.equals(ImageFormat.PGM)) {
+ } else if (subtype.equals(ImageFormats.PGM)) {
writer = new PgmWriter(useRawbits);
- } else if (subtype.equals(ImageFormat.PPM)) {
+ } else if (subtype.equals(ImageFormats.PPM)) {
writer = new PpmWriter(useRawbits);
- } else if (subtype.equals(ImageFormat.PAM)) {
+ } else if (subtype.equals(ImageFormats.PAM)) {
writer = new PamWriter();
}
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java Wed Oct 30 22:17:51 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageReadException;
@@ -63,7 +64,7 @@ public class PpmFileInfo extends FileInf
@Override
public ImageFormat getImageType() {
- return ImageFormat.PPM;
+ return ImageFormats.PPM;
}
@Override
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Wed Oct 30 22:17:51 2013
@@ -29,6 +29,7 @@ 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.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -75,7 +76,7 @@ public class PsdImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.PSD, //
+ return new ImageFormat[] { ImageFormats.PSD, //
};
}
@@ -524,7 +525,7 @@ public class PsdImageParser extends Imag
if (BitsPerPixel < 0) {
BitsPerPixel = 0;
}
- final ImageFormat Format = ImageFormat.PSD;
+ final ImageFormat Format = ImageFormats.PSD;
final String FormatName = "Photoshop";
final String MimeType = "image/x-photoshop";
// we ought to count images, but don't yet.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java Wed Oct 30 22:17:51 2013
@@ -32,6 +32,7 @@ import java.util.ArrayList;
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.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -68,7 +69,7 @@ public class RgbeImageParser extends Ima
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.RGBE };
+ return new ImageFormat[] { ImageFormats.RGBE };
}
@Override
@@ -94,7 +95,7 @@ public class RgbeImageParser extends Ima
final ImageInfo ret = new ImageInfo(
getName(),
32, // todo may be 64 if double?
- new ArrayList<String>(), ImageFormat.RGBE, getName(),
+ new ArrayList<String>(), ImageFormats.RGBE, getName(),
info.getHeight(), "image/vnd.radiance", 1, -1, -1, -1, -1,
info.getWidth(), false, false, false,
ImageInfo.COLOR_TYPE_RGB, "Adaptive RLE");
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Wed Oct 30 22:17:51 2013
@@ -30,6 +30,7 @@ import java.util.Map;
import org.apache.commons.imaging.FormatCompliance;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -79,7 +80,7 @@ public class TiffImageParser extends Ima
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.TIFF, //
+ return new ImageFormat[] { ImageFormats.TIFF, //
};
}
@@ -255,7 +256,7 @@ public class TiffImageParser extends Ima
comments.add(comment);
}
- final ImageFormat format = ImageFormat.TIFF;
+ final ImageFormat format = ImageFormats.TIFF;
final String formatName = "TIFF Tag-based Image File Format";
final String mimeType = "image/tiff";
final int numberOfImages = contents.directories.size();
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java Wed Oct 30 22:17:51 2013
@@ -33,6 +33,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -65,7 +66,7 @@ public class WbmpImageParser extends Ima
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.WBMP, //
+ return new ImageFormat[] { ImageFormats.WBMP, //
};
}
@@ -85,7 +86,7 @@ public class WbmpImageParser extends Ima
throws ImageReadException, IOException {
final WbmpHeader wbmpHeader = readWbmpHeader(byteSource);
return new ImageInfo("WBMP", 1, new ArrayList<String>(),
- ImageFormat.WBMP,
+ ImageFormats.WBMP,
"Wireless Application Protocol Bitmap", wbmpHeader.height,
"image/vnd.wap.wbmp", 1, 0, 0, 0, 0, wbmpHeader.width, false,
false, false, ImageInfo.COLOR_TYPE_BW,
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java Wed Oct 30 22:17:51 2013
@@ -38,6 +38,7 @@ import java.util.Properties;
import java.util.UUID;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -71,7 +72,7 @@ public class XbmImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.XBM, //
+ return new ImageFormat[] { ImageFormats.XBM, //
};
}
@@ -91,7 +92,7 @@ public class XbmImageParser extends Imag
throws ImageReadException, IOException {
final XbmHeader xbmHeader = readXbmHeader(byteSource);
return new ImageInfo("XBM", 1, new ArrayList<String>(),
- ImageFormat.XBM, "X BitMap", xbmHeader.height,
+ ImageFormats.XBM, "X BitMap", xbmHeader.height,
"image/x-xbitmap", 1, 0, 0, 0, 0, xbmHeader.width, false,
false, false, ImageInfo.COLOR_TYPE_BW,
ImageInfo.COMPRESSION_ALGORITHM_NONE);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Wed Oct 30 22:17:51 2013
@@ -41,6 +41,7 @@ import java.util.Properties;
import java.util.UUID;
import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.ImageReadException;
@@ -121,7 +122,7 @@ public class XpmImageParser extends Imag
@Override
protected ImageFormat[] getAcceptedTypes() {
- return new ImageFormat[] { ImageFormat.XPM, //
+ return new ImageFormat[] { ImageFormats.XPM, //
};
}
@@ -156,7 +157,7 @@ public class XpmImageParser extends Imag
}
}
return new ImageInfo("XPM version 3", xpmHeader.numCharsPerPixel * 8,
- new ArrayList<String>(), ImageFormat.XPM,
+ new ArrayList<String>(), ImageFormats.XPM,
"X PixMap", xpmHeader.height, "image/x-xpixmap", 1, 0, 0, 0, 0,
xpmHeader.width, false, isTransparent, true, colorType,
ImageInfo.COMPRESSION_ALGORITHM_NONE);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java Wed Oct 30 22:17:51 2013
@@ -19,7 +19,7 @@ package org.apache.commons.imaging;
import java.io.File;
import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
public class ImagingGuessFormatTest extends ImagingTest {
@@ -38,18 +38,18 @@ public class ImagingGuessFormatTest exte
public static final String TGA_IMAGE_FILE = "tga\\1\\Oregon Scientific DS6639 - DSC_0307 - small.tga";
public void testGuess_all() throws Exception {
- testGuess(ImageFormat.PNG, PNG_IMAGE_FILE);
- testGuess(ImageFormat.GIF, GIF_IMAGE_FILE);
- testGuess(ImageFormat.ICNS, ICNS_IMAGE_FILE);
+ testGuess(ImageFormats.PNG, PNG_IMAGE_FILE);
+ testGuess(ImageFormats.GIF, GIF_IMAGE_FILE);
+ testGuess(ImageFormats.ICNS, ICNS_IMAGE_FILE);
// TODO(cmchen): add ability to sniff ICOs if possible.
// testGuess(ImageFormat.IMAGE_FORMAT_ICO, ICO_IMAGE_FILE);
- testGuess(ImageFormat.TIFF, TIFF_IMAGE_FILE);
- testGuess(ImageFormat.JPEG, JPEG_IMAGE_FILE);
- testGuess(ImageFormat.BMP, BMP_IMAGE_FILE);
- testGuess(ImageFormat.PSD, PSD_IMAGE_FILE);
- testGuess(ImageFormat.PBM, PBM_IMAGE_FILE);
- testGuess(ImageFormat.PGM, PGM_IMAGE_FILE);
- testGuess(ImageFormat.PPM, PPM_IMAGE_FILE);
+ testGuess(ImageFormats.TIFF, TIFF_IMAGE_FILE);
+ testGuess(ImageFormats.JPEG, JPEG_IMAGE_FILE);
+ testGuess(ImageFormats.BMP, BMP_IMAGE_FILE);
+ testGuess(ImageFormats.PSD, PSD_IMAGE_FILE);
+ testGuess(ImageFormats.PBM, PBM_IMAGE_FILE);
+ testGuess(ImageFormats.PGM, PGM_IMAGE_FILE);
+ testGuess(ImageFormats.PPM, PPM_IMAGE_FILE);
// TODO(cmchen): add ability to sniff TGAs if possible.
// testGuess(ImageFormat.IMAGE_FORMAT_TGA, TGA_IMAGE_FILE);
// TODO(cmchen): Add test images for these formats.
@@ -60,7 +60,7 @@ public class ImagingGuessFormatTest exte
public static final String UNKNOWN_IMAGE_FILE = "jpg\\1\\info.txt";
public void testGuess_unknown() throws Exception {
- testGuess(ImageFormat.UNKNOWN, UNKNOWN_IMAGE_FILE);
+ testGuess(ImageFormats.UNKNOWN, UNKNOWN_IMAGE_FILE);
}
public void testGuess(final ImageFormat expectedFormat, String imagePath)
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java Wed Oct 30 22:17:51 2013
@@ -29,6 +29,7 @@ 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.ImageReadException;
import org.apache.commons.imaging.Imaging;
@@ -85,8 +86,8 @@ public class ByteSourceImageTest extends
checkGetImageSize(imageFile, imageFileBytes);
final ImageFormat imageFormat = Imaging.guessFormat(imageFile);
- if (ImageFormat.JPEG != imageFormat
- && ImageFormat.UNKNOWN != imageFormat) {
+ if (ImageFormats.JPEG != imageFormat
+ && ImageFormats.UNKNOWN != imageFormat) {
checkGetBufferedImage(imageFile, imageFileBytes);
}
}
@@ -125,12 +126,12 @@ public class ByteSourceImageTest extends
// check guessFormat()
final ImageFormat imageFormatFile = Imaging.guessFormat(imageFile);
assertNotNull(imageFormatFile);
- assertTrue(imageFormatFile != ImageFormat.UNKNOWN);
+ assertTrue(imageFormatFile != ImageFormats.UNKNOWN);
// Debug.debug("imageFormatFile", imageFormatFile);
final ImageFormat imageFormatBytes = Imaging.guessFormat(imageFileBytes);
assertNotNull(imageFormatBytes);
- assertTrue(imageFormatBytes != ImageFormat.UNKNOWN);
+ assertTrue(imageFormatBytes != ImageFormats.UNKNOWN);
// Debug.debug("imageFormatBytes", imageFormatBytes);
assertTrue(imageFormatBytes == imageFormatFile);
@@ -158,8 +159,8 @@ public class ByteSourceImageTest extends
final Map<String,Object> params = new HashMap<String,Object>();
final boolean ignoreImageData = isPhilHarveyTestImage(imageFile);
final ImageFormat imageFormat = Imaging.guessFormat(imageFile);
- if (imageFormat.equals(ImageFormat.TIFF)
- || imageFormat.equals(ImageFormat.JPEG)) {
+ if (imageFormat.equals(ImageFormats.TIFF)
+ || imageFormat.equals(ImageFormats.JPEG)) {
params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
}
@@ -198,7 +199,7 @@ public class ByteSourceImageTest extends
assertTrue(imageInfoFile.getBitsPerPixel() > 0);
assertNotNull(imageInfoFile.getFormat());
- assertTrue(imageInfoFile.getFormat() != ImageFormat.UNKNOWN);
+ assertTrue(imageInfoFile.getFormat() != ImageFormats.UNKNOWN);
assertNotNull(imageInfoFile.getFormatName());
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java Wed Oct 30 22:17:51 2013
@@ -23,6 +23,7 @@ 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.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
import org.apache.commons.imaging.Imaging;
@@ -35,7 +36,7 @@ public class ImageWriteExample {
// read image
final BufferedImage image = Imaging.getBufferedImage(file);
- final ImageFormat format = ImageFormat.TIFF;
+ final ImageFormat format = ImageFormats.TIFF;
final Map<String,Object> params = new HashMap<String,Object>();
// set optional parameters if you like
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java Wed Oct 30 22:17:51 2013
@@ -27,6 +27,7 @@ import java.util.Map;
import org.apache.commons.imaging.FormatCompliance;
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;
@@ -64,7 +65,7 @@ public class SampleUsage {
// <b>Write an image. </b>
final BufferedImage image = someImage;
final File dst = someFile;
- final ImageFormat format = ImageFormat.PNG;
+ final ImageFormat format = ImageFormats.PNG;
final Map<String,Object> optional_params = new HashMap<String,Object>();
Imaging.writeImage(image, dst, format, optional_params);
@@ -92,7 +93,7 @@ public class SampleUsage {
// <b>try to guess the image's format. </b>
final ImageFormat image_format = Imaging.guessFormat(imageBytes);
- image_format.equals(ImageFormat.PNG);
+ image_format.equals(ImageFormats.PNG);
// <b>get all metadata stored in EXIF format (ie. from JPEG or
// TIFF). </b>
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ public abstract class BmpBaseTest extend
private static boolean isBmp(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.BMP;
+ return format == ImageFormats.BMP;
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java Wed Oct 30 22:17:51 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;
@@ -137,7 +137,7 @@ public class BmpRoundtripTest extends Bm
// Boolean.TRUE);
final byte bytes[] = Imaging.writeImageToBytes(srcImage,
- ImageFormat.BMP, writeParams);
+ ImageFormats.BMP, writeParams);
// Debug.debug("bytes", bytes);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ public abstract class DcxBaseTest extend
private static boolean isDcx(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.DCX;
+ return format == ImageFormats.DCX;
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ public abstract class GifBaseTest extend
private static boolean isGif(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.GIF;
+ return format == ImageFormats.GIF;
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ public abstract class IcnsBaseTest exten
private static boolean isIcns(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.ICNS;
+ return format == ImageFormats.ICNS;
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ public abstract class JpegBaseTest exten
protected static boolean isJpeg(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.JPEG;
+ return format == ImageFormats.JPEG;
}
public static final ImageFilter imageFilter = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java Wed Oct 30 22:17:51 2013
@@ -22,7 +22,7 @@ import java.io.File;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
@@ -48,7 +48,7 @@ public class MicrosoftTagTest extends Ex
exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, title);
final Map<String,Object> params = new TreeMap<String,Object>();
params.put(TiffConstants.PARAM_KEY_EXIF, exifSet);
- final byte[] bytes = Imaging.writeImageToBytes(image, ImageFormat.TIFF, params);
+ final byte[] bytes = Imaging.writeImageToBytes(image, ImageFormats.TIFF, params);
checkFields(bytes);
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ public abstract class PamBaseTest extend
private static boolean isPam(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.PAM;
+ return format == ImageFormats.PAM;
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java Wed Oct 30 22:17:51 2013
@@ -22,7 +22,7 @@ import java.io.File;
import java.util.Hashtable;
import java.util.List;
-import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.util.Debug;
@@ -53,7 +53,7 @@ public class ConvertPngToGifTest extends
final File outFile = createTempFile(imageFile.getName() + ".", ".gif");
// Debug.debug("outFile", outFile);
- Imaging.writeImage(image, outFile, ImageFormat.GIF,
+ Imaging.writeImage(image, outFile, ImageFormats.GIF,
params);
}
Debug.debug("complete.");
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ public abstract class PngBaseTest extend
private static boolean isPng(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.PNG;
+ return format == ImageFormats.PNG;
}
private static final ImageFilter imageFilter = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java Wed Oct 30 22:17:51 2013
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.util.Debug;
@@ -63,7 +63,7 @@ public class PngMultipleRoundtripTest ex
final Map<String,Object> writeParams = new HashMap<String,Object>();
Imaging.writeImage(image, tempFile,
- ImageFormat.PNG, writeParams);
+ ImageFormats.PNG, writeParams);
lastFile = tempFile;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java Wed Oct 30 22:17:51 2013
@@ -25,7 +25,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.formats.png.PngConstants;
import org.apache.commons.imaging.formats.png.PngImageInfo;
@@ -66,7 +66,7 @@ public class PngTextTest extends PngBase
writeParams.put(PngConstants.PARAM_KEY_PNG_TEXT_CHUNKS, writeTexts);
final byte bytes[] = Imaging.writeImageToBytes(srcImage,
- ImageFormat.PNG, writeParams);
+ ImageFormats.PNG, writeParams);
final File tempFile = createTempFile("temp", ".png");
IoUtils.writeToFile(bytes, tempFile);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java Wed Oct 30 22:17:51 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.formats.png.PngConstants;
import org.apache.commons.imaging.util.Debug;
@@ -61,7 +61,7 @@ public class PngWriteForceTrueColorText
params.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR,
Boolean.TRUE);
Imaging.writeImage(image, outFile,
- ImageFormat.PNG, params);
+ ImageFormats.PNG, params);
final BufferedImage image2 = Imaging.getBufferedImage(outFile,
new HashMap<String,Object>());
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java Wed Oct 30 22:17:51 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/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java Wed Oct 30 22:17:51 2013
@@ -21,6 +21,7 @@ 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;
@@ -29,7 +30,7 @@ public abstract class PsdBaseTest extend
private static boolean isPsd(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.PSD;
+ return format == ImageFormats.PSD;
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java Wed Oct 30 22:17:51 2013
@@ -21,6 +21,7 @@ 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;
@@ -29,7 +30,7 @@ public abstract class RgbeBaseTest exten
private static boolean isRgbe(final File file) throws IOException,
ImageReadException {
final ImageFormat format = Imaging.guessFormat(file);
- return format == ImageFormat.RGBE;
+ return format == ImageFormats.RGBE;
}
private static final ImageFilter IMAGE_FILTER = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java Wed Oct 30 22:17:51 2013
@@ -22,6 +22,7 @@ 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;
@@ -31,7 +32,7 @@ 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;
+ return format == ImageFormats.TIFF;
}
private static final ImageFilter imageFilter = new ImageFilter() {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java Wed Oct 30 22:17:51 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/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java Wed Oct 30 22:17:51 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/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java Wed Oct 30 22:17:51 2013
@@ -24,6 +24,7 @@ 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;
@@ -51,7 +52,7 @@ public class XmpUpdateTest extends Imagi
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 +61,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/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java?rev=1537329&r1=1537328&r2=1537329&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java Wed Oct 30 22:17:51 2013
@@ -24,6 +24,7 @@ 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;
@@ -64,41 +65,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), //
};