You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by da...@apache.org on 2012/04/16 20:33:29 UTC
svn commit: r1326730 [2/2] - in /commons/proper/imaging/trunk: ./
src/main/java/org/apache/commons/imaging/
src/main/java/org/apache/commons/imaging/formats/ico/
src/main/java/org/apache/commons/imaging/formats/jpeg/
src/main/java/org/apache/commons/im...
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -23,16 +23,16 @@ import java.util.List;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class JpegBaseTest extends SanselanTest
+public abstract class JpegBaseTest extends ImagingTest
{
protected static boolean isJpeg(File file) throws IOException,
ImageReadException
{
- ImageFormat format = Sanselan.guessFormat(file);
+ ImageFormat format = Imaging.guessFormat(file);
return format == ImageFormat.IMAGE_FORMAT_JPEG;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java Mon Apr 16 18:33:26 2012
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -50,11 +50,11 @@ public class JpegReadTest extends JpegBa
.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(
!ignoreImageData));
- IImageMetadata metadata = Sanselan.getMetadata(imageFile, params);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
// assertNotNull(metadata);
Debug.debug("metadata", metadata);
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java Mon Apr 16 18:33:26 2012
@@ -22,19 +22,19 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
-public class JpegWithJpegThumbnailTest extends SanselanTest {
+public class JpegWithJpegThumbnailTest extends ImagingTest {
public void testSingleImage() throws Exception
{
File imageFile = getTestImageByName("img_F028c_small.jpg");
Map params = new HashMap();
- IImageMetadata metadata = Sanselan.getMetadata(imageFile, params);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
assertNotNull(metadata);
JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
BufferedImage image = jpegMetadata.getEXIFThumbnail();
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffField;
@@ -40,7 +40,7 @@ public class AsciiFieldTest extends Exif
Map params = new HashMap();
- IImageMetadata metadata = Sanselan.getMetadata(imageFile, params);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
assertNotNull(metadata);
JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java Mon Apr 16 18:33:26 2012
@@ -22,12 +22,12 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
-public abstract class ExifBaseTest extends SanselanTest
+public abstract class ExifBaseTest extends ImagingTest
{
// public ExifBaseTest(String name)
// {
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
@@ -58,7 +58,7 @@ public class ExifDumpTest extends ExifBa
.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(
!ignoreImageData));
- JpegImageMetadata metadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata metadata = (JpegImageMetadata) Imaging
.getMetadata(imageFile, params);
if (null == metadata)
continue;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Mon Apr 16 18:33:26 2012
@@ -30,7 +30,7 @@ import java.util.Set;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
@@ -72,7 +72,7 @@ public class ExifRewriteTest extends Exi
new JpegUtils().dumpJFIF(byteSource);
{
- JpegImageMetadata metadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata metadata = (JpegImageMetadata) Imaging
.getMetadata(imageFile);
// assertNotNull(metadata.getExif());
}
@@ -112,7 +112,7 @@ public class ExifRewriteTest extends Exi
Debug.debug("Source Segments:");
new JpegUtils().dumpJFIF(byteSource);
- JpegImageMetadata originalMetadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata originalMetadata = (JpegImageMetadata) Imaging
.getMetadata(imageFile);
assertNotNull(originalMetadata);
@@ -154,7 +154,7 @@ public class ExifRewriteTest extends Exi
// assertTrue(!hasExifData(tempFile));
- JpegImageMetadata newMetadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata newMetadata = (JpegImageMetadata) Imaging
.getMetadata(tempFile);
assertNotNull(newMetadata);
TiffImageMetadata newExifMetadata = newMetadata.getExif();
@@ -198,7 +198,7 @@ public class ExifRewriteTest extends Exi
Debug.debug("Source Segments:");
new JpegUtils().dumpJFIF(byteSource);
- JpegImageMetadata oldMetadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata oldMetadata = (JpegImageMetadata) Imaging
.getMetadata(imageFile);
if (null == oldMetadata)
continue;
@@ -228,7 +228,7 @@ public class ExifRewriteTest extends Exi
// assertTrue(!hasExifData(tempFile));
- JpegImageMetadata newMetadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata newMetadata = (JpegImageMetadata) Imaging
.getMetadata(tempFile);
assertNotNull(newMetadata);
TiffImageMetadata newExifMetadata = newMetadata.getExif();
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java Mon Apr 16 18:33:26 2012
@@ -22,13 +22,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingConstants;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
import org.apache.commons.imaging.util.Debug;
-public class GpsTest extends ExifBaseTest implements SanselanConstants
+public class GpsTest extends ExifBaseTest implements ImagingConstants
{
public void test() throws Exception
@@ -56,7 +56,7 @@ public class GpsTest extends ExifBaseTes
params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(
!ignoreImageData));
- JpegImageMetadata metadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata metadata = (JpegImageMetadata) Imaging
.getMetadata(imageFile, params);
if (null == metadata)
continue;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java Mon Apr 16 18:33:26 2012
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.tiff.TiffField;
@@ -77,7 +77,7 @@ public abstract class SpecificExifTagTes
params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData));
// note that metadata might be null if no metadata is found.
- IImageMetadata metadata = Sanselan.getMetadata(imageFile, params);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile, params);
if (null == metadata)
return;
JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java Mon Apr 16 18:33:26 2012
@@ -22,12 +22,12 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
-public abstract class IptcBaseTest extends SanselanTest
+public abstract class IptcBaseTest extends ImagingTest
{
protected static boolean hasIptcData(File file)
{
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
import org.apache.commons.imaging.formats.jpeg.JpegPhotoshopMetadata;
import org.apache.commons.imaging.formats.jpeg.iptc.IptcRecord;
@@ -54,7 +54,7 @@ public class IptcDumpTest extends IptcBa
!ignoreImageData));
// params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);
- JpegImageMetadata metadata = (JpegImageMetadata) Sanselan
+ JpegImageMetadata metadata = (JpegImageMetadata) Imaging
.getMetadata(imageFile, params);
assertNotNull(metadata);
assertNotNull(metadata.getPhotoshop());
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java Mon Apr 16 18:33:26 2012
@@ -22,12 +22,12 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.common.bytesource.ByteSource;
import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
-public abstract class JpegXmpBaseTest extends SanselanTest
+public abstract class JpegXmpBaseTest extends ImagingTest
{
protected static boolean hasJpegXmpData(File file)
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java Mon Apr 16 18:33:26 2012
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class PcxBaseTest extends SanselanTest
+public abstract class PcxBaseTest extends ImagingTest
{
private static boolean isPcx(File file)
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -44,14 +44,14 @@ public class PcxReadTest extends PcxBase
File imageFile = (File) images.get(i);
Debug.debug("imageFile", imageFile);
- IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
Map params = new HashMap();
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
assertNotNull(image);
}
}
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -23,7 +23,7 @@ import java.util.Hashtable;
import java.util.List;
import org.apache.commons.imaging.ImageFormat;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.util.Debug;
public class ConvertPngToGifTest extends PngBaseTest {
@@ -47,13 +47,13 @@ public class ConvertPngToGifTest extends
Hashtable params = new Hashtable();
// params.put(SanselanConstants.PARAM_KEY_VERBOSE, Boolean.TRUE);
- BufferedImage image = Sanselan.getBufferedImage(imageFile, params);
+ BufferedImage image = Imaging.getBufferedImage(imageFile, params);
assertNotNull(image);
File outFile = createTempFile(imageFile.getName()+".", ".gif");
// Debug.debug("outFile", outFile);
- Sanselan.writeImage(image, outFile, ImageFormat.IMAGE_FORMAT_GIF,
+ Imaging.writeImage(image, outFile, ImageFormat.IMAGE_FORMAT_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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -23,16 +23,16 @@ import java.util.List;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class PngBaseTest extends SanselanTest
+public abstract class PngBaseTest extends ImagingTest
{
private static boolean isPng(File file) throws IOException,
ImageReadException
{
- ImageFormat format = Sanselan.guessFormat(file);
+ ImageFormat format = Imaging.guessFormat(file);
return format == ImageFormat.IMAGE_FORMAT_PNG;
}
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.imaging.ImageFormat;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.util.Debug;
public class PngMultipleRoundtripTest extends PngBaseTest
@@ -54,7 +54,7 @@ public class PngMultipleRoundtripTest ex
Map readParams = new HashMap();
// readParams.put(SanselanConstants.BUFFERED_IMAGE_FACTORY,
// new RgbBufferedImageFactory());
- BufferedImage image = Sanselan.getBufferedImage(lastFile,
+ BufferedImage image = Imaging.getBufferedImage(lastFile,
readParams);
assertNotNull(image);
@@ -63,7 +63,7 @@ public class PngMultipleRoundtripTest ex
Debug.debug("tempFile", tempFile);
Map writeParams = new HashMap();
- Sanselan.writeImage(image, tempFile,
+ Imaging.writeImage(image, tempFile,
ImageFormat.IMAGE_FORMAT_PNG, writeParams);
lastFile = tempFile;
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.io.File;
import java.util.List;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -47,7 +47,7 @@ public class PngReadTest extends PngBase
{
try
{
- Sanselan.getMetadata(imageFile);
+ Imaging.getMetadata(imageFile);
fail("Image read should have failed.");
} catch (Exception e)
{
@@ -55,7 +55,7 @@ public class PngReadTest extends PngBase
try
{
- Sanselan.getImageInfo(imageFile);
+ Imaging.getImageInfo(imageFile);
fail("Image read should have failed.");
} catch (Exception e)
{
@@ -63,20 +63,20 @@ public class PngReadTest extends PngBase
try
{
- Sanselan.getBufferedImage(imageFile);
+ Imaging.getBufferedImage(imageFile);
fail("Image read should have failed.");
} catch (Exception e)
{
}
} else
{
- IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile);
assertNotNull(imageInfo);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
assertNotNull(image);
}
}
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageFormat;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.formats.png.PngConstants;
import org.apache.commons.imaging.formats.png.PngImageInfo;
import org.apache.commons.imaging.formats.png.PngText;
@@ -67,13 +67,13 @@ public class PngTextTest extends PngBase
writeParams.put(PngConstants.PARAM_KEY_PNG_TEXT_CHUNKS, writeTexts);
- byte bytes[] = Sanselan.writeImageToBytes(srcImage,
+ byte bytes[] = Imaging.writeImageToBytes(srcImage,
ImageFormat.IMAGE_FORMAT_PNG, writeParams);
File tempFile = createTempFile("temp", ".png");
IoUtils.writeToFile(bytes, tempFile);
- PngImageInfo imageInfo = (PngImageInfo) Sanselan.getImageInfo(bytes);
+ PngImageInfo imageInfo = (PngImageInfo) Imaging.getImageInfo(bytes);
assertNotNull(imageInfo);
List readTexts = imageInfo.getTextChunks();
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageFormat;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.formats.png.PngConstants;
import org.apache.commons.imaging.util.Debug;
@@ -49,7 +49,7 @@ public class PngWriteForceTrueColorText
// params.put(SanselanConstants.PARAM_KEY_VERBOSE,
// Boolean.TRUE);
- BufferedImage image = Sanselan.getBufferedImage(imageFile,
+ BufferedImage image = Imaging.getBufferedImage(imageFile,
new HashMap());
assertNotNull(image);
@@ -59,10 +59,10 @@ public class PngWriteForceTrueColorText
Map params = new HashMap();
params.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR,
Boolean.TRUE);
- Sanselan.writeImage(image, outFile,
+ Imaging.writeImage(image, outFile,
ImageFormat.IMAGE_FORMAT_PNG, params);
- BufferedImage image2 = Sanselan.getBufferedImage(outFile,
+ BufferedImage image2 = Imaging.getBufferedImage(outFile,
new HashMap());
} catch (Exception e) {
Debug.debug("imageFile", imageFile);
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -27,11 +27,11 @@ import java.util.Random;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.util.IoUtils;
-public class PngWriteReadTest extends SanselanTest
+public class PngWriteReadTest extends ImagingTest
{
// public PngWriteReadTest(String name)
// {
@@ -101,10 +101,10 @@ public class PngWriteReadTest extends Sa
{
// Test for https://issues.apache.org/jira/browse/SANSELAN-52
int[][] smallAscendingPixels = getAscendingRawData(256, 256);
- byte[] pngBytes = Sanselan.writeImageToBytes(
+ byte[] pngBytes = Imaging.writeImageToBytes(
imageDataToBufferedImage(smallAscendingPixels),
ImageFormat.IMAGE_FORMAT_PNG, null);
- assertTrue(Sanselan.getImageInfo(pngBytes).isTransparent());
+ assertTrue(Imaging.getImageInfo(pngBytes).isTransparent());
}
private BufferedImage imageDataToBufferedImage(int[][] rawData)
@@ -145,7 +145,7 @@ public class PngWriteReadTest extends Sa
// writeParams.put(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR,
// Boolean.TRUE);
- byte bytes[] = Sanselan.writeImageToBytes(srcImage,
+ byte bytes[] = Imaging.writeImageToBytes(srcImage,
ImageFormat.IMAGE_FORMAT_PNG, writeParams);
// Debug.debug("bytes", bytes);
@@ -153,7 +153,7 @@ public class PngWriteReadTest extends Sa
File tempFile = createTempFile("temp", ".png");
IoUtils.writeToFile(bytes, tempFile);
- BufferedImage dstImage = Sanselan.getBufferedImage(bytes);
+ BufferedImage dstImage = Imaging.getBufferedImage(bytes);
assertNotNull(dstImage);
assertTrue(srcImage.getWidth() == dstImage.getWidth());
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -22,14 +22,14 @@ import java.util.List;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class RgbeBaseTest extends SanselanTest {
+public abstract class RgbeBaseTest extends ImagingTest {
private static boolean isRgbe( File file ) throws IOException,
ImageReadException
{
- ImageFormat format = Sanselan.guessFormat( file );
+ ImageFormat format = Imaging.guessFormat( file );
return format == ImageFormat.IMAGE_FORMAT_RGBE;
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java Mon Apr 16 18:33:26 2012
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -44,13 +44,13 @@ public class RgbeReadTest extends RgbeBa
File imageFile = (File) images.get( i );
Debug.debug( "imageFile", imageFile );
- IImageMetadata metadata = Sanselan.getMetadata( imageFile );
+ IImageMetadata metadata = Imaging.getMetadata( imageFile );
assertNotNull(metadata);
- ImageInfo imageInfo = Sanselan.getImageInfo( imageFile );
+ ImageInfo imageInfo = Imaging.getImageInfo( imageFile );
assertNotNull( imageInfo );
- BufferedImage image = Sanselan.getBufferedImage( imageFile );
+ BufferedImage image = Imaging.getBufferedImage( imageFile );
assertNotNull( image );
}
}
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -23,16 +23,16 @@ import java.util.List;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class TiffBaseTest extends SanselanTest
+public abstract class TiffBaseTest extends ImagingTest
{
private static boolean isTiff(File file) throws IOException,
ImageReadException
{
- ImageFormat format = Sanselan.guessFormat(file);
+ ImageFormat format = Imaging.guessFormat(file);
return format == ImageFormat.IMAGE_FORMAT_TIFF;
}
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,8 +24,8 @@ import java.util.HashMap;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingConstants;
import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
import org.apache.commons.imaging.util.Debug;
@@ -159,9 +159,9 @@ public class TiffCcittTest extends TiffB
try {
HashMap params = new HashMap();
- params.put(SanselanConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_1D);
- byte[] compressed = Sanselan.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
- BufferedImage result = Sanselan.getBufferedImage(compressed);
+ params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_1D);
+ byte[] compressed = Imaging.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
+ BufferedImage result = Imaging.getBufferedImage(compressed);
compareImages(image, result);
} catch (ImageWriteException ex) {
Debug.debug(ex);
@@ -176,10 +176,10 @@ public class TiffCcittTest extends TiffB
try {
HashMap params = new HashMap();
- params.put(SanselanConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
+ params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 0);
- byte[] compressed = Sanselan.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
- BufferedImage result = Sanselan.getBufferedImage(compressed);
+ byte[] compressed = Imaging.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
+ BufferedImage result = Imaging.getBufferedImage(compressed);
compareImages(image, result);
} catch (ImageWriteException ex) {
Debug.debug(ex);
@@ -194,10 +194,10 @@ public class TiffCcittTest extends TiffB
try {
HashMap params = new HashMap();
- params.put(SanselanConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
+ params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 4);
- byte[] compressed = Sanselan.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
- BufferedImage result = Sanselan.getBufferedImage(compressed);
+ byte[] compressed = Imaging.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
+ BufferedImage result = Imaging.getBufferedImage(compressed);
compareImages(image, result);
} catch (ImageWriteException ex) {
Debug.debug(ex);
@@ -212,10 +212,10 @@ public class TiffCcittTest extends TiffB
try {
HashMap params = new HashMap();
- params.put(SanselanConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
+ params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 1);
- byte[] compressed = Sanselan.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
- BufferedImage result = Sanselan.getBufferedImage(compressed);
+ byte[] compressed = Imaging.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
+ BufferedImage result = Imaging.getBufferedImage(compressed);
compareImages(image, result);
} catch (ImageWriteException ex) {
Debug.debug(ex);
@@ -230,10 +230,10 @@ public class TiffCcittTest extends TiffB
try {
HashMap params = new HashMap();
- params.put(SanselanConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
+ params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3);
params.put(TiffConstants.PARAM_KEY_T4_OPTIONS, 5);
- byte[] compressed = Sanselan.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
- BufferedImage result = Sanselan.getBufferedImage(compressed);
+ byte[] compressed = Imaging.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
+ BufferedImage result = Imaging.getBufferedImage(compressed);
compareImages(image, result);
} catch (ImageWriteException ex) {
Debug.debug(ex);
@@ -248,9 +248,9 @@ public class TiffCcittTest extends TiffB
try {
HashMap params = new HashMap();
- params.put(SanselanConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4);
- byte[] compressed = Sanselan.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
- BufferedImage result = Sanselan.getBufferedImage(compressed);
+ params.put(ImagingConstants.PARAM_KEY_COMPRESSION, TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4);
+ byte[] compressed = Imaging.writeImageToBytes(image, ImageFormat.IMAGE_FORMAT_TIFF, params);
+ BufferedImage result = Imaging.getBufferedImage(compressed);
compareImages(image, result);
} catch (ImageWriteException ex) {
Debug.debug(ex);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.io.File;
import java.util.List;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -40,13 +40,13 @@ public class TiffReadTest extends TiffBa
File imageFile = (File) images.get(i);
Debug.debug("imageFile", imageFile);
- IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile);
assertNotNull(metadata);
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile);
assertNotNull(imageInfo);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
assertNotNull(image);
}
}
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -41,22 +41,22 @@ public class TiffRoundtripTest extends T
File imageFile = (File) images.get(i);
Debug.debug("imageFile", imageFile);
- IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile);
assertNotNull(metadata);
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile);
assertNotNull(imageInfo);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
assertNotNull(image);
File tempFile = createTempFile(imageFile.getName() + ".", ".tif");
Map params = new HashMap();
- Sanselan.writeImage(image, tempFile, ImageFormat.IMAGE_FORMAT_TIFF,
+ Imaging.writeImage(image, tempFile, ImageFormat.IMAGE_FORMAT_TIFF,
params);
image = null;
- BufferedImage image2 = Sanselan.getBufferedImage(tempFile);
+ BufferedImage image2 = Imaging.getBufferedImage(tempFile);
assertNotNull(image2);
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java Mon Apr 16 18:33:26 2012
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.forma
import java.lang.reflect.Field;
import java.util.List;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.formats.tiff.constants.AdobePageMaker6TagConstants;
import org.apache.commons.imaging.formats.tiff.constants.AdobePhotoshopTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.AliasSketchbookProTagConstants;
@@ -40,7 +40,7 @@ import org.apache.commons.imaging.format
import org.apache.commons.imaging.formats.tiff.constants.WangTagConstants;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
-public class TiffTagIntegrityTest extends SanselanTest {
+public class TiffTagIntegrityTest extends ImagingTest {
public void testTagIntegrity() {
verifyFields(AdobePageMaker6TagConstants.class, AdobePageMaker6TagConstants.ALL_ADOBE_PAGEMAKER_6_TAGS);
verifyFields(AdobePhotoshopTagConstants.class, AdobePhotoshopTagConstants.ALL_ADOBE_PHOTOSHOP_TAGS);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java Mon Apr 16 18:33:26 2012
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class WbmpBaseTest extends SanselanTest
+public abstract class WbmpBaseTest extends ImagingTest
{
private static boolean isWbmp(File file)
{
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -42,14 +42,14 @@ public class WbmpReadTest extends WbmpBa
File imageFile = (File) images.get(i);
Debug.debug("imageFile", imageFile);
- IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
Map params = new HashMap();
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
assertNotNull(image);
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java Mon Apr 16 18:33:26 2012
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class XbmBaseTest extends SanselanTest
+public abstract class XbmBaseTest extends ImagingTest
{
private static boolean isXbm(File file)
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -42,14 +42,14 @@ public class XbmReadTest extends XbmBase
File imageFile = (File) images.get(i);
Debug.debug("imageFile", imageFile);
- IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
Map params = new HashMap();
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
assertNotNull(image);
}
}
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java Mon Apr 16 18:33:26 2012
@@ -20,11 +20,11 @@ package org.apache.commons.imaging.forma
import java.io.File;
import java.util.List;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.util.Debug;
-public class XmpDumpTest extends SanselanTest
+public class XmpDumpTest extends ImagingTest
{
public void test() throws Exception
@@ -44,7 +44,7 @@ public class XmpDumpTest extends Sansela
Debug.debug("imageFile", imageFile);
Debug.debug();
- String xmpXml = Sanselan.getXmpXml(imageFile);
+ String xmpXml = Imaging.getXmpXml(imageFile);
if (null == xmpXml)
continue;
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -24,11 +24,11 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageFormat;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.util.Debug;
-public class XmpUpdateTest extends SanselanTest
+public class XmpUpdateTest extends ImagingTest
{
public void test() throws Exception
@@ -48,9 +48,9 @@ public class XmpUpdateTest extends Sanse
Debug.debug("imageFile", imageFile);
Debug.debug();
- ImageFormat imageFormat = Sanselan.guessFormat(imageFile);
+ ImageFormat imageFormat = Imaging.guessFormat(imageFile);
- String xmpXml = Sanselan.getXmpXml(imageFile);
+ String xmpXml = Imaging.getXmpXml(imageFile);
if (null == xmpXml
&& imageFormat.equals(ImageFormat.IMAGE_FORMAT_GIF))
xmpXml = "temporary test until I can locate a GIF with XMP in the wild.";
@@ -70,15 +70,15 @@ public class XmpUpdateTest extends Sanse
File tempFile = this.createTempFile(imageFile.getName() + ".", "."
+ imageFormat.extension);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
// ----
Map params = new HashMap();
params.put(PARAM_KEY_XMP_XML, xmpXml);
- Sanselan.writeImage(image, tempFile, imageFormat, params);
+ Imaging.writeImage(image, tempFile, imageFormat, params);
- String xmpXmlOut = Sanselan.getXmpXml(tempFile);
+ String xmpXmlOut = Imaging.getXmpXml(tempFile);
assertNotNull(xmpXmlOut);
Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java?rev=1326730&r1=1326729&r2=1326730&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java (original)
+++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java Mon Apr 16 18:33:26 2012
@@ -20,9 +20,9 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImageReadException;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.ImagingTest;
-public abstract class XpmBaseTest extends SanselanTest
+public abstract class XpmBaseTest extends ImagingTest
{
private static boolean isXpm(File file)
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
-import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
@@ -42,14 +42,14 @@ public class XpmReadTest extends XpmBase
File imageFile = (File) images.get(i);
Debug.debug("imageFile", imageFile);
- IImageMetadata metadata = Sanselan.getMetadata(imageFile);
+ IImageMetadata metadata = Imaging.getMetadata(imageFile);
// assertNotNull(metadata);
Map params = new HashMap();
- ImageInfo imageInfo = Sanselan.getImageInfo(imageFile, params);
+ ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
assertNotNull(imageInfo);
- BufferedImage image = Sanselan.getBufferedImage(imageFile);
+ BufferedImage image = Imaging.getBufferedImage(imageFile);
assertNotNull(image);
}
}
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=1326730&r1=1326729&r2=1326730&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 Mon Apr 16 18:33:26 2012
@@ -26,14 +26,14 @@ import java.util.Map;
import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.ImageWriteException;
-import org.apache.commons.imaging.Sanselan;
-import org.apache.commons.imaging.SanselanConstants;
-import org.apache.commons.imaging.SanselanTest;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingConstants;
+import org.apache.commons.imaging.ImagingTest;
import org.apache.commons.imaging.common.RgbBufferedImageFactory;
import org.apache.commons.imaging.util.Debug;
import org.apache.commons.imaging.util.IoUtils;
-public class RoundtripTest extends SanselanTest
+public class RoundtripTest extends ImagingTest
{
private static final int COLOR_FULL_RGB = 0;
private static final int COLOR_LIMITED_INDEX = 1;
@@ -424,12 +424,12 @@ public class RoundtripTest extends Sanse
// Debug.debug("tempFile: " + tempFile.getName());
Map params = new HashMap();
- Sanselan.writeImage(testImage, temp1, formatInfo.format, params);
+ Imaging.writeImage(testImage, temp1, formatInfo.format, params);
Map readParams = new HashMap();
- readParams.put(SanselanConstants.BUFFERED_IMAGE_FACTORY,
+ readParams.put(ImagingConstants.BUFFERED_IMAGE_FACTORY,
new RgbBufferedImageFactory());
- BufferedImage image2 = Sanselan.getBufferedImage(temp1, readParams);
+ BufferedImage image2 = Imaging.getBufferedImage(temp1, readParams);
assertNotNull(image2);
if (imageExact)
@@ -444,7 +444,7 @@ public class RoundtripTest extends Sanse
File temp2 = createTempFile(tempPrefix + ".", "."
+ formatInfo.format.extension);
// Debug.debug("tempFile: " + tempFile.getName());
- Sanselan.writeImage(image2, temp2, formatInfo.format, params);
+ Imaging.writeImage(image2, temp2, formatInfo.format, params);
compareFilesExact(temp1, temp2);
}