You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/11/27 01:51:21 UTC
svn commit: r1545891 [3/3] - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/formats/bmp/
main/java/org/apache/commons/imaging/formats/dcx/ ma...
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java Wed Nov 27 00:51:19 2013
@@ -44,7 +44,7 @@ public class PsdReadTest extends PsdBase
final IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
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=1545891&r1=1545890&r2=1545891&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 Nov 27 00:51:19 2013
@@ -171,7 +171,7 @@ public class TiffCcittTest extends TiffB
}
try {
- final HashMap<String,Object> params = new HashMap<String,Object>();
+ final HashMap<String, Object> params = new HashMap<String, Object>();
params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
TiffConstants.TIFF_COMPRESSION_CCITT_1D);
final byte[] compressed = Imaging.writeImageToBytes(image,
@@ -190,7 +190,7 @@ public class TiffCcittTest extends TiffB
}
try {
- final HashMap<String,Object> params = new HashMap<String,Object>();
+ final HashMap<String, Object> params = new HashMap<String, Object>();
params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 0);
@@ -210,7 +210,7 @@ public class TiffCcittTest extends TiffB
}
try {
- final HashMap<String,Object> params = new HashMap<String,Object>();
+ final HashMap<String, Object> params = new HashMap<String, Object>();
params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 4);
@@ -230,7 +230,7 @@ public class TiffCcittTest extends TiffB
}
try {
- final HashMap<String,Object> params = new HashMap<String,Object>();
+ final HashMap<String, Object> params = new HashMap<String, Object>();
params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 1);
@@ -250,7 +250,7 @@ public class TiffCcittTest extends TiffB
}
try {
- final HashMap<String,Object> params = new HashMap<String,Object>();
+ final HashMap<String, Object> params = new HashMap<String, Object>();
params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 5);
@@ -270,7 +270,7 @@ public class TiffCcittTest extends TiffB
}
try {
- final HashMap<String,Object> params = new HashMap<String,Object>();
+ final HashMap<String, Object> params = new HashMap<String, Object>();
params.put(ImagingConstants.PARAM_KEY_COMPRESSION,
TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4);
final byte[] compressed = Imaging.writeImageToBytes(image,
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java Wed Nov 27 00:51:19 2013
@@ -60,7 +60,7 @@ public class TiffReadWriteTagsTest exten
writer.write(tiff, set);
TiffReader reader = new TiffReader(true);
- Map<String,Object> params = new TreeMap<String,Object>();
+ Map<String, Object> params = new TreeMap<String, Object>();
FormatCompliance formatCompliance = new FormatCompliance("");
TiffContents contents = reader.readFirstDirectory(new ByteSourceArray(tiff.toByteArray()), params, true, formatCompliance);
TiffDirectory rootDir = contents.directories.get(0);
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=1545891&r1=1545890&r2=1545891&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 Nov 27 00:51:19 2013
@@ -59,7 +59,7 @@ public class TiffRoundtripTest extends T
};
for (final int compression : compressions) {
final File tempFile = createTempFile(imageFile.getName() + "-" + compression + ".", ".tif");
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
params.put(TiffConstants.PARAM_KEY_COMPRESSION, compression);
Imaging.writeImage(image, tempFile, ImageFormats.TIFF,
params);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java Wed Nov 27 00:51:19 2013
@@ -32,7 +32,7 @@ public class TiffSubImageTest extends Ti
BufferedImage src = new BufferedImage(10, 10, BufferedImage.TYPE_INT_RGB);
byte[] imageBytes = Imaging.writeImageToBytes(src, ImageFormats.TIFF, null);
- Map<String,Object> params = new TreeMap<String,Object>();
+ Map<String, Object> params = new TreeMap<String, Object>();
params.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 0);
params.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 0);
params.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, 2);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java Wed Nov 27 00:51:19 2013
@@ -44,7 +44,7 @@ public class WbmpReadTest extends WbmpBa
final IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java Wed Nov 27 00:51:19 2013
@@ -44,7 +44,7 @@ public class XbmReadTest extends XbmBase
final IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
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=1545891&r1=1545890&r2=1545891&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 Nov 27 00:51:19 2013
@@ -84,7 +84,7 @@ public class XmpUpdateTest extends Imagi
// ----
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
params.put(PARAM_KEY_XMP_XML, xmpXml);
Imaging.writeImage(image, tempFile, imageFormat, params);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java Wed Nov 27 00:51:19 2013
@@ -44,7 +44,7 @@ public class XpmReadTest extends XpmBase
final IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
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=1545891&r1=1545890&r2=1545891&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 Nov 27 00:51:19 2013
@@ -407,7 +407,7 @@ public class RoundtripTest extends Imagi
final File temp1 = createTempFile("pixeldensity.", "."
+ formatInfo.format.getExtension());
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
final PixelDensity pixelDensity = PixelDensity.createFromPixelsPerInch(75, 150);
params.put(ImagingConstants.PARAM_KEY_PIXEL_DENSITY, pixelDensity);
Imaging.writeImage(testImage, temp1, formatInfo.format, params);
@@ -437,10 +437,10 @@ public class RoundtripTest extends Imagi
+ formatInfo.format.getExtension());
Debug.debug("tempFile: " + temp1.getName());
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
Imaging.writeImage(testImage, temp1, formatInfo.format, params);
- final Map<String,Object> readParams = new HashMap<String,Object>();
+ final Map<String, Object> readParams = new HashMap<String, Object>();
readParams.put(ImagingConstants.BUFFERED_IMAGE_FACTORY,
new RgbBufferedImageFactory());
final BufferedImage image2 = Imaging.getBufferedImage(temp1, readParams);