svn commit: r1326649 [2/7] - in /commons/proper/sanselan/trunk/src: main/java/org/apache/commons/imaging/ main/java/org/apache/commons/imaging/color/ main/java/org/apache/commons/imaging/common/ main/java/org/apache/commons/imaging/common/bytesource/ m...

[da...@apache.org]

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.bytesource;
+package org.apache.commons.imaging.common.bytesource;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
 
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.util.Debug;
 
 public class ByteSourceFile extends ByteSource
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStream.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.bytesource;
+package org.apache.commons.imaging.common.bytesource;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTree.java Mon Apr 16 15:33:13 2012
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.itu_t4;
+package org.apache.commons.imaging.common.itu_t4;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.sanselan.common.BitInputStreamFlexible;
+import org.apache.commons.imaging.common.BitInputStreamFlexible;
 
 /**
  * A Huffman tree implemented as 1 array for high locality of reference.

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeException.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeException.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeException.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeException.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.itu_t4;
+package org.apache.commons.imaging.common.itu_t4;
 
 class HuffmanTreeException extends Exception {
     private static final long serialVersionUID = 1L;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java Mon Apr 16 15:33:13 2012
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.itu_t4;
+package org.apache.commons.imaging.common.itu_t4;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.BitArrayOutputStream;
-import org.apache.commons.sanselan.common.BitInputStreamFlexible;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.common.BitArrayOutputStream;
+import org.apache.commons.imaging.common.BitInputStreamFlexible;
 
 
 public class T4AndT6Compression {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4_T6_Tables.java Mon Apr 16 15:33:13 2012
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.itu_t4;
+package org.apache.commons.imaging.common.itu_t4;
 
-import org.apache.commons.sanselan.common.BitArrayOutputStream;
+import org.apache.commons.imaging.common.BitArrayOutputStream;
 
 class T4_T6_Tables {
     public static class Entry {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/BitsToByteInputStream.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.mylzw;
+package org.apache.commons.imaging.common.mylzw;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitInputStream.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitInputStream.java Mon Apr 16 15:33:13 2012
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.mylzw;
+package org.apache.commons.imaging.common.mylzw;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.common.BinaryConstants;
+import org.apache.commons.imaging.common.BinaryConstants;
 
 public class MyBitInputStream extends InputStream implements BinaryConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyBitOutputStream.java Mon Apr 16 15:33:13 2012
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.mylzw;
+package org.apache.commons.imaging.common.mylzw;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.apache.commons.sanselan.common.BinaryConstants;
+import org.apache.commons.imaging.common.BinaryConstants;
 
 public class MyBitOutputStream extends OutputStream implements BinaryConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.mylzw;
+package org.apache.commons.imaging.common.mylzw;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.common.mylzw;
+package org.apache.commons.imaging.common.mylzw;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp;
+package org.apache.commons.imaging.formats.bmp;
 
 public class BmpHeaderInfo
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp;
+package org.apache.commons.imaging.formats.bmp;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -29,28 +29,28 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.FormatCompliance;
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
-import org.apache.commons.sanselan.ImageParser;
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.PixelDensity;
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.ImageBuilder;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParser;
-import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserBitFields;
-import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserRgb;
-import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParserRle;
-import org.apache.commons.sanselan.formats.bmp.writers.BmpWriter;
-import org.apache.commons.sanselan.formats.bmp.writers.BmpWriterPalette;
-import org.apache.commons.sanselan.formats.bmp.writers.BmpWriterRgb;
-import org.apache.commons.sanselan.palette.PaletteFactory;
-import org.apache.commons.sanselan.palette.SimplePalette;
-import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.ParamMap;
+import org.apache.commons.imaging.FormatCompliance;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.PixelDensity;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageBuilder;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.formats.bmp.pixelparsers.PixelParser;
+import org.apache.commons.imaging.formats.bmp.pixelparsers.PixelParserBitFields;
+import org.apache.commons.imaging.formats.bmp.pixelparsers.PixelParserRgb;
+import org.apache.commons.imaging.formats.bmp.pixelparsers.PixelParserRle;
+import org.apache.commons.imaging.formats.bmp.writers.BmpWriter;
+import org.apache.commons.imaging.formats.bmp.writers.BmpWriterPalette;
+import org.apache.commons.imaging.formats.bmp.writers.BmpWriterRgb;
+import org.apache.commons.imaging.palette.PaletteFactory;
+import org.apache.commons.imaging.palette.SimplePalette;
+import org.apache.commons.imaging.util.Debug;
+import org.apache.commons.imaging.util.ParamMap;
 
 public class BmpImageParser extends ImageParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java Mon Apr 16 15:33:13 2012
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp;
+package org.apache.commons.imaging.formats.bmp;
 
-import org.apache.commons.sanselan.formats.bmp.pixelparsers.PixelParser;
+import org.apache.commons.imaging.formats.bmp.pixelparsers.PixelParser;
 
 class ImageContents
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java Mon Apr 16 15:33:13 2012
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.pixelparsers;
+package org.apache.commons.imaging.formats.bmp.pixelparsers;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.ImageBuilder;
-import org.apache.commons.sanselan.formats.bmp.BmpHeaderInfo;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.common.ImageBuilder;
+import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
 public abstract class PixelParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java Mon Apr 16 15:33:13 2012
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.pixelparsers;
+package org.apache.commons.imaging.formats.bmp.pixelparsers;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.bmp.BmpHeaderInfo;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
 public class PixelParserBitFields extends PixelParserSimple
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java Mon Apr 16 15:33:13 2012
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.pixelparsers;
+package org.apache.commons.imaging.formats.bmp.pixelparsers;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.bmp.BmpHeaderInfo;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
 public class PixelParserRgb extends PixelParserSimple
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java Mon Apr 16 15:33:13 2012
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.pixelparsers;
+package org.apache.commons.imaging.formats.bmp.pixelparsers;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.ImageBuilder;
-import org.apache.commons.sanselan.formats.bmp.BmpHeaderInfo;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.ImageBuilder;
+import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
 public class PixelParserRle extends PixelParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java Mon Apr 16 15:33:13 2012
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.pixelparsers;
+package org.apache.commons.imaging.formats.bmp.pixelparsers;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.ImageBuilder;
-import org.apache.commons.sanselan.formats.bmp.BmpHeaderInfo;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.ImageBuilder;
+import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
 public abstract class PixelParserSimple extends PixelParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java Mon Apr 16 15:33:13 2012
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.writers;
+package org.apache.commons.imaging.formats.bmp.writers;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 
-import org.apache.commons.sanselan.common.BinaryOutputStream;
+import org.apache.commons.imaging.common.BinaryOutputStream;
 
 public abstract class BmpWriter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java Mon Apr 16 15:33:13 2012
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.writers;
+package org.apache.commons.imaging.formats.bmp.writers;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.palette.SimplePalette;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.palette.SimplePalette;
 
 public class BmpWriterPalette extends BmpWriter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java Mon Apr 16 15:33:13 2012
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.bmp.writers;
+package org.apache.commons.imaging.formats.bmp.writers;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.sanselan.common.BinaryOutputStream;
+import org.apache.commons.imaging.common.BinaryOutputStream;
 
 public class BmpWriterRgb extends BmpWriter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.dcx;
+package org.apache.commons.imaging.formats.dcx;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -28,17 +28,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
-import org.apache.commons.sanselan.ImageParser;
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
-import org.apache.commons.sanselan.formats.pcx.PcxConstants;
-import org.apache.commons.sanselan.formats.pcx.PcxImageParser;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
+import org.apache.commons.imaging.formats.pcx.PcxConstants;
+import org.apache.commons.imaging.formats.pcx.PcxImageParser;
 
 public class DcxImageParser extends ImageParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.gif;
+package org.apache.commons.imaging.formats.gif;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifBlock.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifBlock.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifBlock.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifBlock.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.gif;
+package org.apache.commons.imaging.formats.gif;
 
 class GifBlock
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifHeaderInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifHeaderInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifHeaderInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifHeaderInfo.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.gif;
+package org.apache.commons.imaging.formats.gif;
 
 class GifHeaderInfo
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.gif;
+package org.apache.commons.imaging.formats.gif;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -30,22 +30,22 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.FormatCompliance;
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
-import org.apache.commons.sanselan.ImageParser;
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.ImageBuilder;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.common.mylzw.MyLzwCompressor;
-import org.apache.commons.sanselan.common.mylzw.MyLzwDecompressor;
-import org.apache.commons.sanselan.palette.Palette;
-import org.apache.commons.sanselan.palette.PaletteFactory;
-import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.ParamMap;
+import org.apache.commons.imaging.FormatCompliance;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageBuilder;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.common.mylzw.MyLzwCompressor;
+import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor;
+import org.apache.commons.imaging.palette.Palette;
+import org.apache.commons.imaging.palette.PaletteFactory;
+import org.apache.commons.imaging.util.Debug;
+import org.apache.commons.imaging.util.ParamMap;
 
 public class GifImageParser extends ImageParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GraphicControlExtension.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GraphicControlExtension.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GraphicControlExtension.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GraphicControlExtension.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.gif;
+package org.apache.commons.imaging.formats.gif;
 
 class GraphicControlExtension extends GifBlock
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.gif;
+package org.apache.commons.imaging.formats.gif;
 
 import java.util.List;
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.gif;
+package org.apache.commons.imaging.formats.gif;
 
 public class ImageDescriptor extends GifBlock
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.java Mon Apr 16 15:33:13 2012
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.icns;
+package org.apache.commons.imaging.formats.icns;
 
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.ImageBuilder;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.ImageBuilder;
 
 public class IcnsDecoder
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.icns;
+package org.apache.commons.imaging.formats.icns;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -28,16 +28,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
-import org.apache.commons.sanselan.ImageParser;
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.ParamMap;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.util.Debug;
+import org.apache.commons.imaging.util.ParamMap;
 
 public class IcnsImageParser extends ImageParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsType.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.icns;
+package org.apache.commons.imaging.formats.icns;
 
 import java.io.UnsupportedEncodingException;
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/Rle24Compression.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/Rle24Compression.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/Rle24Compression.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/icns/Rle24Compression.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.icns;
+package org.apache.commons.imaging.formats.icns;
 
 class Rle24Compression
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.ico;
+package org.apache.commons.imaging.formats.ico;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -30,19 +30,19 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
-import org.apache.commons.sanselan.ImageParser;
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.Sanselan;
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.formats.bmp.BmpImageParser;
-import org.apache.commons.sanselan.palette.PaletteFactory;
-import org.apache.commons.sanselan.palette.SimplePalette;
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.formats.bmp.BmpImageParser;
+import org.apache.commons.imaging.palette.PaletteFactory;
+import org.apache.commons.imaging.palette.SimplePalette;
+import org.apache.commons.imaging.util.Debug;
 
 public class IcoImageParser extends ImageParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/Block.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/Block.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/Block.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/Block.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg;
+package org.apache.commons.imaging.formats.jpeg;
 
 public final class Block
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java Mon Apr 16 15:33:13 2012
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg;
+package org.apache.commons.imaging.formats.jpeg;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.sanselan.common.BinaryConstant;
+import org.apache.commons.imaging.common.BinaryConstant;
 
 public interface JpegConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg;
+package org.apache.commons.imaging.formats.jpeg;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -25,15 +25,15 @@ import java.util.List;
 
 import javax.imageio.ImageIO;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.Sanselan;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.formats.tiff.JpegImageData;
-import org.apache.commons.sanselan.formats.tiff.TiffField;
-import org.apache.commons.sanselan.formats.tiff.TiffImageData;
-import org.apache.commons.sanselan.formats.tiff.TiffImageMetadata;
-import org.apache.commons.sanselan.formats.tiff.taginfos.TagInfo;
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.Sanselan;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.formats.tiff.JpegImageData;
+import org.apache.commons.imaging.formats.tiff.TiffField;
+import org.apache.commons.imaging.formats.tiff.TiffImageData;
+import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
+import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
+import org.apache.commons.imaging.util.Debug;
 
 public class JpegImageMetadata implements IImageMetadata {
     private final JpegPhotoshopMetadata photoshop;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg;
+package org.apache.commons.imaging.formats.jpeg;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -30,30 +30,30 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
-import org.apache.commons.sanselan.ImageParser;
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.formats.jpeg.decoder.JpegDecoder;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IptcParser;
-import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
-import org.apache.commons.sanselan.formats.jpeg.segments.App13Segment;
-import org.apache.commons.sanselan.formats.jpeg.segments.App2Segment;
-import org.apache.commons.sanselan.formats.jpeg.segments.ComSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.DqtSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.GenericSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.JfifSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.Segment;
-import org.apache.commons.sanselan.formats.jpeg.segments.SofnSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.UnknownSegment;
-import org.apache.commons.sanselan.formats.jpeg.xmp.JpegXmpParser;
-import org.apache.commons.sanselan.formats.tiff.TiffField;
-import org.apache.commons.sanselan.formats.tiff.TiffImageMetadata;
-import org.apache.commons.sanselan.formats.tiff.TiffImageParser;
-import org.apache.commons.sanselan.formats.tiff.constants.TiffTagConstants;
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.formats.jpeg.decoder.JpegDecoder;
+import org.apache.commons.imaging.formats.jpeg.iptc.IptcParser;
+import org.apache.commons.imaging.formats.jpeg.iptc.PhotoshopApp13Data;
+import org.apache.commons.imaging.formats.jpeg.segments.App13Segment;
+import org.apache.commons.imaging.formats.jpeg.segments.App2Segment;
+import org.apache.commons.imaging.formats.jpeg.segments.ComSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.DqtSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.GenericSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.JfifSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.Segment;
+import org.apache.commons.imaging.formats.jpeg.segments.SofnSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.UnknownSegment;
+import org.apache.commons.imaging.formats.jpeg.xmp.JpegXmpParser;
+import org.apache.commons.imaging.formats.tiff.TiffField;
+import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
+import org.apache.commons.imaging.formats.tiff.TiffImageParser;
+import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
+import org.apache.commons.imaging.util.Debug;
 
 public class JpegImageParser extends ImageParser implements JpegConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegPhotoshopMetadata.java Mon Apr 16 15:33:13 2012
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg;
+package org.apache.commons.imaging.formats.jpeg;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.sanselan.common.ImageMetadata;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IptcConstants;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IptcRecord;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IptcTypes;
-import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.formats.jpeg.iptc.IptcConstants;
+import org.apache.commons.imaging.formats.jpeg.iptc.IptcRecord;
+import org.apache.commons.imaging.formats.jpeg.iptc.IptcTypes;
+import org.apache.commons.imaging.formats.jpeg.iptc.PhotoshopApp13Data;
+import org.apache.commons.imaging.util.Debug;
 
 public class JpegPhotoshopMetadata extends ImageMetadata implements
         IptcConstants

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java Mon Apr 16 15:33:13 2012
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg;
+package org.apache.commons.imaging.formats.jpeg;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.util.Debug;
 
 public class JpegUtils extends BinaryFileParser implements JpegConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/ZigZag.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/ZigZag.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/ZigZag.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/ZigZag.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg;
+package org.apache.commons.imaging.formats.jpeg;
 
 public class ZigZag
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.decoder;
+package org.apache.commons.imaging.formats.jpeg.decoder;
 
 public class Dct
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.decoder;
+package org.apache.commons.imaging.formats.jpeg.decoder;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
@@ -25,17 +25,17 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Properties;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.formats.jpeg.Block;
-import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
-import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
-import org.apache.commons.sanselan.formats.jpeg.ZigZag;
-import org.apache.commons.sanselan.formats.jpeg.segments.DhtSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.DqtSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.SofnSegment;
-import org.apache.commons.sanselan.formats.jpeg.segments.SosSegment;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.formats.jpeg.Block;
+import org.apache.commons.imaging.formats.jpeg.JpegConstants;
+import org.apache.commons.imaging.formats.jpeg.JpegUtils;
+import org.apache.commons.imaging.formats.jpeg.ZigZag;
+import org.apache.commons.imaging.formats.jpeg.segments.DhtSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.DqtSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.SofnSegment;
+import org.apache.commons.imaging.formats.jpeg.segments.SosSegment;
 
 public class JpegDecoder extends BinaryFileParser implements JpegUtils.Visitor,
         JpegConstants

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStream.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStream.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStream.java Mon Apr 16 15:33:13 2012
@@ -13,13 +13,13 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.decoder;
+package org.apache.commons.imaging.formats.jpeg.decoder;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.jpeg.JpegConstants;
 
 public class JpegInputStream
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.decoder;
+package org.apache.commons.imaging.formats.jpeg.decoder;
 
 public class YCbCrConverter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.exif;
+package org.apache.commons.imaging.formats.jpeg.exif;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -24,20 +24,20 @@ import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
-import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
-import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
-import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
-import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
-import org.apache.commons.sanselan.formats.tiff.write.TiffImageWriterBase;
-import org.apache.commons.sanselan.formats.tiff.write.TiffImageWriterLossless;
-import org.apache.commons.sanselan.formats.tiff.write.TiffImageWriterLossy;
-import org.apache.commons.sanselan.formats.tiff.write.TiffOutputSet;
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
+import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
+import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
+import org.apache.commons.imaging.formats.jpeg.JpegConstants;
+import org.apache.commons.imaging.formats.jpeg.JpegUtils;
+import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterBase;
+import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossless;
+import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy;
+import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
+import org.apache.commons.imaging.util.Debug;
 
 /**
  * Interface for Exif write/update/remove functionality for Jpeg/JFIF images.

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBlock.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBlock.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBlock.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBlock.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 /*
  * Represents an IPTC block, a set of key-value pairs of Photoshop IPTC data.

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcConstants.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcConstants.java Mon Apr 16 15:33:13 2012
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
-import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
+import org.apache.commons.imaging.formats.jpeg.JpegConstants;
 
 public interface IptcConstants extends JpegConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java Mon Apr 16 15:33:13 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,14 +25,14 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.SanselanConstants;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.common.BinaryInputStream;
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.ParamMap;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.common.BinaryInputStream;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.util.Debug;
+import org.apache.commons.imaging.util.ParamMap;
 
 public class IptcParser extends BinaryFileParser implements IptcConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcRecord.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Comparator;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 
 public interface IptcType

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.java Mon Apr 16 15:33:13 2012
@@ -1,4 +1,4 @@
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 public enum IptcTypes implements IptcType {
     RECORD_VERSION(

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,13 +26,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.common.bytesource.ByteSourceArray;
-import org.apache.commons.sanselan.common.bytesource.ByteSourceFile;
-import org.apache.commons.sanselan.common.bytesource.ByteSourceInputStream;
-import org.apache.commons.sanselan.formats.jpeg.xmp.JpegRewriter;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.common.bytesource.ByteSourceArray;
+import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
+import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream;
+import org.apache.commons.imaging.formats.jpeg.xmp.JpegRewriter;
 
 /**
  * Interface for Exif write/update/remove functionality for Jpeg/JFIF images.

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/PhotoshopApp13Data.java Mon Apr 16 15:33:13 2012
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.iptc;
+package org.apache.commons.imaging.formats.jpeg.iptc;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java Mon Apr 16 15:33:13 2012
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IptcParser;
-import org.apache.commons.sanselan.formats.jpeg.iptc.PhotoshopApp13Data;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
+import org.apache.commons.imaging.formats.jpeg.iptc.IptcParser;
+import org.apache.commons.imaging.formats.jpeg.iptc.PhotoshopApp13Data;
 
 public class App13Segment extends AppnSegment
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App2Segment.java Mon Apr 16 15:33:13 2012
@@ -14,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
 
 public class App2Segment extends AppnSegment implements Comparable<App2Segment>
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegment.java Mon Apr 16 15:33:13 2012
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
+import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
 
 public class AppnSegment extends GenericSegment
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class DqtSegment extends Segment
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java Mon Apr 16 15:33:13 2012
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java Mon Apr 16 15:33:13 2012
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.jpeg.JpegConstants;
 
 public class JfifSegment extends Segment implements JpegConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/Segment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/Segment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/Segment.java Mon Apr 16 15:33:13 2012
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.PrintWriter;
 
-import org.apache.commons.sanselan.common.BinaryFileParser;
+import org.apache.commons.imaging.common.BinaryFileParser;
 
 public abstract class Segment extends BinaryFileParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java Mon Apr 16 15:33:13 2012
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.segments;
+package org.apache.commons.imaging.formats.jpeg.segments;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.jpeg.JpegImageParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
 
 public class SofnSegment extends Segment
 {