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 17:33:39 UTC

svn commit: r1326649 [3/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...

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.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/UnknownSegment.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.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/xmp/JpegRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java Mon Apr 16 15:33:13 2012
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.jpeg.xmp;
+package org.apache.commons.imaging.formats.jpeg.xmp;
 
 import java.io.IOException;
 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.formats.jpeg.JpegConstants;
-import org.apache.commons.sanselan.formats.jpeg.JpegUtils;
-import org.apache.commons.sanselan.formats.jpeg.iptc.IptcParser;
+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.formats.jpeg.JpegConstants;
+import org.apache.commons.imaging.formats.jpeg.JpegUtils;
+import org.apache.commons.imaging.formats.jpeg.iptc.IptcParser;
 
 /**
  * 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/xmp/JpegXmpParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpParser.java Mon Apr 16 15:33:13 2012
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.commons.sanselan.formats.jpeg.xmp;
+package org.apache.commons.imaging.formats.jpeg.xmp;
 
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.formats.jpeg.JpegConstants;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.formats.jpeg.JpegConstants;
 
 public class JpegXmpParser extends BinaryFileParser implements JpegConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.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.xmp;
+package org.apache.commons.imaging.formats.jpeg.xmp;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -24,12 +24,12 @@ 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.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.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;
 
 /**
  * Interface for Exif write/update/remove functionality for Jpeg/JFIF images.

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.java Mon Apr 16 15:33:13 2012
@@ -12,9 +12,9 @@
  *  limitations under the License.
  *  under the License.
  */
-package org.apache.commons.sanselan.formats.pcx;
+package org.apache.commons.imaging.formats.pcx;
 
-import org.apache.commons.sanselan.SanselanConstants;
+import org.apache.commons.imaging.SanselanConstants;
 
 public interface PcxConstants extends SanselanConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.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.pcx;
+package org.apache.commons.imaging.formats.pcx;
 
 import java.awt.Dimension;
 import java.awt.Transparency;
@@ -37,13 +37,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-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.IImageMetadata;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
+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.IImageMetadata;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
 
 public class PcxImageParser extends ImageParser implements PcxConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java Mon Apr 16 15:33:13 2012
@@ -13,7 +13,7 @@
  *  under the License.
  */
 
-package org.apache.commons.sanselan.formats.pcx;
+package org.apache.commons.imaging.formats.pcx;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -22,11 +22,11 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.PixelDensity;
-import org.apache.commons.sanselan.common.BinaryOutputStream;
-import org.apache.commons.sanselan.palette.PaletteFactory;
-import org.apache.commons.sanselan.palette.SimplePalette;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.PixelDensity;
+import org.apache.commons.imaging.common.BinaryOutputStream;
+import org.apache.commons.imaging.palette.PaletteFactory;
+import org.apache.commons.imaging.palette.SimplePalette;
 
 public class PcxWriter implements PcxConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/BitParser.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.png;
+package org.apache.commons.imaging.formats.png;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class BitParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.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.png;
+package org.apache.commons.imaging.formats.png;
 
 public class GammaCorrection
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.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.png;
+package org.apache.commons.imaging.formats.png;
 
-import org.apache.commons.sanselan.SanselanConstants;
-import org.apache.commons.sanselan.common.BinaryConstant;
-import org.apache.commons.sanselan.common.BinaryFileFunctions;
+import org.apache.commons.imaging.SanselanConstants;
+import org.apache.commons.imaging.common.BinaryConstant;
+import org.apache.commons.imaging.common.BinaryFileFunctions;
 
 public interface PngConstants extends SanselanConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.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.png;
+package org.apache.commons.imaging.formats.png;
 
 // should just use ints, not longs
 public class PngCrc

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.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.png;
+package org.apache.commons.imaging.formats.png;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
 
 public class PngImageInfo extends ImageInfo
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.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.png;
+package org.apache.commons.imaging.formats.png;
 
 import java.awt.Dimension;
 import java.awt.color.ColorSpace;
@@ -34,33 +34,33 @@ import java.util.List;
 import java.util.Map;
 import java.util.zip.InflaterInputStream;
 
-import org.apache.commons.sanselan.ColorTools;
-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.IImageMetadata;
-import org.apache.commons.sanselan.common.ImageMetadata;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunk;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkIdat;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkIhdr;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkPlte;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkGama;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkIccp;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkItxt;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkPhys;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkText;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkZtxt;
-import org.apache.commons.sanselan.formats.png.chunks.PngTextChunk;
-import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilter;
-import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilterGrayscale;
-import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilterIndexedColor;
-import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilterTrueColor;
-import org.apache.commons.sanselan.icc.IccProfileParser;
-import org.apache.commons.sanselan.util.Debug;
-import org.apache.commons.sanselan.util.ParamMap;
+import org.apache.commons.imaging.ColorTools;
+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.IImageMetadata;
+import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.formats.png.chunks.PngChunk;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkIdat;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkIhdr;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkPlte;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkGama;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkIccp;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkItxt;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkPhys;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkText;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkZtxt;
+import org.apache.commons.imaging.formats.png.chunks.PngTextChunk;
+import org.apache.commons.imaging.formats.transparencyfilters.TransparencyFilter;
+import org.apache.commons.imaging.formats.transparencyfilters.TransparencyFilterGrayscale;
+import org.apache.commons.imaging.formats.transparencyfilters.TransparencyFilterIndexedColor;
+import org.apache.commons.imaging.formats.transparencyfilters.TransparencyFilterTrueColor;
+import org.apache.commons.imaging.icc.IccProfileParser;
+import org.apache.commons.imaging.util.Debug;
+import org.apache.commons.imaging.util.ParamMap;
 
 public class PngImageParser extends ImageParser implements PngConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngText.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngText.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngText.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngText.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.png;
+package org.apache.commons.imaging.formats.png;
 
 public abstract class PngText
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.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.png;
+package org.apache.commons.imaging.formats.png;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
@@ -25,15 +25,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.zip.DeflaterOutputStream;
 
-import org.apache.commons.sanselan.ImageWriteException;
-import org.apache.commons.sanselan.PixelDensity;
-import org.apache.commons.sanselan.common.ZLibUtils;
-import org.apache.commons.sanselan.palette.MedianCutQuantizer;
-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.sanselan.util.UnicodeUtils;
+import org.apache.commons.imaging.ImageWriteException;
+import org.apache.commons.imaging.PixelDensity;
+import org.apache.commons.imaging.common.ZLibUtils;
+import org.apache.commons.imaging.palette.MedianCutQuantizer;
+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;
+import org.apache.commons.imaging.util.UnicodeUtils;
 
 public class PngWriter implements PngConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediter.java Mon Apr 16 15:33:13 2012
@@ -14,22 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.png;
+package org.apache.commons.imaging.formats.png;
 
 import java.awt.image.BufferedImage;
 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.png.chunks.PngChunkPlte;
-import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilter;
-import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilterAverage;
-import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilterNone;
-import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilterPaeth;
-import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilterSub;
-import org.apache.commons.sanselan.formats.png.scanlinefilters.ScanlineFilterUp;
-import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilter;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkPlte;
+import org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilter;
+import org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilterAverage;
+import org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilterNone;
+import org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilterPaeth;
+import org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilterSub;
+import org.apache.commons.imaging.formats.png.scanlinefilters.ScanlineFilterUp;
+import org.apache.commons.imaging.formats.transparencyfilters.TransparencyFilter;
 
 public abstract class ScanExpediter extends BinaryFileParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.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.png;
+package org.apache.commons.imaging.formats.png;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkPlte;
-import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilter;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkPlte;
+import org.apache.commons.imaging.formats.transparencyfilters.TransparencyFilter;
 
 public class ScanExpediterInterlaced extends ScanExpediter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.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.png;
+package org.apache.commons.imaging.formats.png;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.png.chunks.PngChunkPlte;
-import org.apache.commons.sanselan.formats.transparencyfilters.TransparencyFilter;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.png.chunks.PngChunkPlte;
+import org.apache.commons.imaging.formats.transparencyfilters.TransparencyFilter;
 
 public class ScanExpediterSimple extends ScanExpediter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.ByteArrayInputStream;
 
-import org.apache.commons.sanselan.common.BinaryFileParser;
+import org.apache.commons.imaging.common.BinaryFileParser;
 
 public class PngChunk extends BinaryFileParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.ZLibUtils;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.ZLibUtils;
 
 public class PngChunkIccp extends PngChunk
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 public class PngChunkIdat extends PngChunk
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.ZLibUtils;
-import org.apache.commons.sanselan.formats.png.PngConstants;
-import org.apache.commons.sanselan.formats.png.PngText;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.ZLibUtils;
+import org.apache.commons.imaging.formats.png.PngConstants;
+import org.apache.commons.imaging.formats.png.PngText;
 
 public class PngChunkItxt extends PngTextChunk
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.png.GammaCorrection;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.png.GammaCorrection;
 
 public class PngChunkPlte extends PngChunk
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.formats.png.PngText;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.formats.png.PngText;
 
 public class PngChunkText extends PngTextChunk
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.ZLibUtils;
-import org.apache.commons.sanselan.formats.png.PngConstants;
-import org.apache.commons.sanselan.formats.png.PngText;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.ZLibUtils;
+import org.apache.commons.imaging.formats.png.PngConstants;
+import org.apache.commons.imaging.formats.png.PngText;
 
 public class PngChunkZtxt extends PngTextChunk
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.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.png.chunks;
+package org.apache.commons.imaging.formats.png.chunks;
 
-import org.apache.commons.sanselan.formats.png.PngText;
+import org.apache.commons.imaging.formats.png.PngText;
 
 public abstract class PngTextChunk extends PngChunk
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.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.png.scanlinefilters;
+package org.apache.commons.imaging.formats.png.scanlinefilters;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public abstract class ScanlineFilter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.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.png.scanlinefilters;
+package org.apache.commons.imaging.formats.png.scanlinefilters;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class ScanlineFilterAverage extends ScanlineFilter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.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.png.scanlinefilters;
+package org.apache.commons.imaging.formats.png.scanlinefilters;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class ScanlineFilterNone extends ScanlineFilter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.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.png.scanlinefilters;
+package org.apache.commons.imaging.formats.png.scanlinefilters;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class ScanlineFilterPaeth extends ScanlineFilter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.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.png.scanlinefilters;
+package org.apache.commons.imaging.formats.png.scanlinefilters;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class ScanlineFilterSub extends ScanlineFilter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.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.png.scanlinefilters;
+package org.apache.commons.imaging.formats.png.scanlinefilters;
 
 import java.io.IOException;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class ScanlineFilterUp extends ScanlineFilter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.common.ImageBuilder;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.common.ImageBuilder;
 
 public abstract class FileInfo
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
 
 public class PbmFileInfo extends FileInfo
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageWriteException;
+import org.apache.commons.imaging.ImageWriteException;
 
 public class PbmWriter extends PnmWriter implements PnmConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmFileInfo.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
 
 public class PgmFileInfo extends FileInfo
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageWriteException;
+import org.apache.commons.imaging.ImageWriteException;
 
 public class PgmWriter extends PnmWriter implements PnmConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmConstants.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmConstants.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 public interface PnmConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -28,15 +28,15 @@ 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.IImageMetadata;
-import org.apache.commons.sanselan.common.ImageBuilder;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
-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.common.IImageMetadata;
+import org.apache.commons.imaging.common.ImageBuilder;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
+import org.apache.commons.imaging.util.Debug;
 
 public class PnmImageParser extends ImageParser implements PnmConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageWriteException;
+import org.apache.commons.imaging.ImageWriteException;
 
 public abstract class PnmWriter
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageFormat;
-import org.apache.commons.sanselan.ImageInfo;
+import org.apache.commons.imaging.ImageFormat;
+import org.apache.commons.imaging.ImageInfo;
 
 public class PpmFileInfo extends FileInfo
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
 
-import org.apache.commons.sanselan.ImageWriteException;
+import org.apache.commons.imaging.ImageWriteException;
 
 public class PpmWriter extends PnmWriter implements PnmConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.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.pnm;
+package org.apache.commons.imaging.formats.pnm;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/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.psd;
+package org.apache.commons.imaging.formats.psd;
 
 import java.io.PrintWriter;
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.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.psd;
+package org.apache.commons.imaging.formats.psd;
 
 import java.io.UnsupportedEncodingException;
 
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.util.Debug;
 
 class ImageResourceBlock
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.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.psd;
+package org.apache.commons.imaging.formats.psd;
 
-import org.apache.commons.sanselan.ImageReadException;
+import org.apache.commons.imaging.ImageReadException;
 
 public class ImageResourceType
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.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.psd;
+package org.apache.commons.imaging.formats.psd;
 
-import org.apache.commons.sanselan.util.Debug;
+import org.apache.commons.imaging.util.Debug;
 
 public class PsdConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.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.psd;
+package org.apache.commons.imaging.formats.psd;
 
 import java.io.PrintWriter;
 

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.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.psd;
+package org.apache.commons.imaging.formats.psd;
 
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
@@ -28,23 +28,23 @@ import java.util.ArrayList;
 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.psd.dataparsers.DataParser;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserBitmap;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserCmyk;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserGrayscale;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserIndexed;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserLab;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParserRgb;
-import org.apache.commons.sanselan.formats.psd.datareaders.CompressedDataReader;
-import org.apache.commons.sanselan.formats.psd.datareaders.DataReader;
-import org.apache.commons.sanselan.formats.psd.datareaders.UncompressedDataReader;
-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.psd.dataparsers.DataParser;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParserBitmap;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParserCmyk;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParserGrayscale;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParserIndexed;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParserLab;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParserRgb;
+import org.apache.commons.imaging.formats.psd.datareaders.CompressedDataReader;
+import org.apache.commons.imaging.formats.psd.datareaders.DataReader;
+import org.apache.commons.imaging.formats.psd.datareaders.UncompressedDataReader;
+import org.apache.commons.imaging.util.Debug;
 
 public class PsdImageParser extends ImageParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParser.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.psd.dataparsers;
+package org.apache.commons.imaging.formats.psd.dataparsers;
 
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBuffer;
 
-import org.apache.commons.sanselan.formats.psd.ImageContents;
-import org.apache.commons.sanselan.formats.psd.PsdHeaderInfo;
+import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
 
 public abstract class DataParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.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.psd.dataparsers;
+package org.apache.commons.imaging.formats.psd.dataparsers;
 
-import org.apache.commons.sanselan.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.ImageContents;
 
 public class DataParserBitmap extends DataParser
 {

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

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.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.psd.dataparsers;
+package org.apache.commons.imaging.formats.psd.dataparsers;
 
-import org.apache.commons.sanselan.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.ImageContents;
 
 public class DataParserGrayscale extends DataParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.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.psd.dataparsers;
+package org.apache.commons.imaging.formats.psd.dataparsers;
 
-import org.apache.commons.sanselan.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.ImageContents;
 
 public class DataParserIndexed extends DataParser
 {

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

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.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.psd.dataparsers;
+package org.apache.commons.imaging.formats.psd.dataparsers;
 
-import org.apache.commons.sanselan.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.ImageContents;
 
 public class DataParserRgb extends DataParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.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.psd.dataparsers;
+package org.apache.commons.imaging.formats.psd.dataparsers;
 
-import org.apache.commons.sanselan.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.ImageContents;
 
 public class DataParserStub extends DataParser
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java Mon Apr 16 15:33:13 2012
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.psd.datareaders;
+package org.apache.commons.imaging.formats.psd.datareaders;
 
 import java.awt.image.BufferedImage;
 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.common.PackBits;
-import org.apache.commons.sanselan.common.mylzw.BitsToByteInputStream;
-import org.apache.commons.sanselan.common.mylzw.MyBitInputStream;
-import org.apache.commons.sanselan.formats.psd.ImageContents;
-import org.apache.commons.sanselan.formats.psd.PsdHeaderInfo;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.common.PackBits;
+import org.apache.commons.imaging.common.mylzw.BitsToByteInputStream;
+import org.apache.commons.imaging.common.mylzw.MyBitInputStream;
+import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
 
 public class CompressedDataReader extends DataReader
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.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.psd.datareaders;
+package org.apache.commons.imaging.formats.psd.datareaders;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.commons.sanselan.ImageReadException;
-import org.apache.commons.sanselan.common.BinaryConstants;
-import org.apache.commons.sanselan.common.BinaryFileParser;
-import org.apache.commons.sanselan.formats.psd.ImageContents;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryConstants;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
 
 public abstract class DataReader implements BinaryConstants
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java Mon Apr 16 15:33:13 2012
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.sanselan.formats.psd.datareaders;
+package org.apache.commons.imaging.formats.psd.datareaders;
 
 import java.awt.image.BufferedImage;
 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.mylzw.BitsToByteInputStream;
-import org.apache.commons.sanselan.common.mylzw.MyBitInputStream;
-import org.apache.commons.sanselan.formats.psd.ImageContents;
-import org.apache.commons.sanselan.formats.psd.PsdHeaderInfo;
-import org.apache.commons.sanselan.formats.psd.dataparsers.DataParser;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.common.BinaryFileParser;
+import org.apache.commons.imaging.common.mylzw.BitsToByteInputStream;
+import org.apache.commons.imaging.common.mylzw.MyBitInputStream;
+import org.apache.commons.imaging.formats.psd.ImageContents;
+import org.apache.commons.imaging.formats.psd.PsdHeaderInfo;
+import org.apache.commons.imaging.formats.psd.dataparsers.DataParser;
 
 public class UncompressedDataReader extends DataReader
 {

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.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.rgbe;
+package org.apache.commons.imaging.formats.rgbe;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeConstants.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeConstants.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeConstants.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.rgbe;
+package org.apache.commons.imaging.formats.rgbe;
 
 interface RgbeConstants {
     // #?RADIANCE

Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java?rev=1326649&r1=1326258&r2=1326649&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.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.rgbe;
+package org.apache.commons.imaging.formats.rgbe;
 
 import java.awt.Dimension;
 import java.awt.Point;
@@ -31,13 +31,13 @@ import java.io.IOException;
 import java.util.ArrayList;
 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.BinaryConstants;
-import org.apache.commons.sanselan.common.IImageMetadata;
-import org.apache.commons.sanselan.common.bytesource.ByteSource;
+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.BinaryConstants;
+import org.apache.commons.imaging.common.IImageMetadata;
+import org.apache.commons.imaging.common.bytesource.ByteSource;
 
 /**
 * Parser for Radiance HDR images