You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2007/12/18 16:03:51 UTC
svn commit: r605222 [1/3] - in
/xmlgraphics/commons/branches/TempNewImagePackage: ./ lib/
src/java/org/apache/xmlgraphics/image/loader/
src/java/org/apache/xmlgraphics/image/loader/cache/
src/java/org/apache/xmlgraphics/image/loader/impl/ src/java/org/...
Author: jeremias
Date: Tue Dec 18 07:03:41 2007
New Revision: 605222
URL: http://svn.apache.org/viewvc?rev=605222&view=rev
Log:
Copied new image loading framework from FOP here as org.apache.xmlgraphics.image.loader.
Changes in the process:
- Added a work-around for a bug in Java 1.4.2 ImageInputStream.readUnsignedInt() (in PreloaderEPS)
- Removed all remaining dependencies on FOP.
Note: this adds a new dependency on Apache Commons Logging (and Java 1.4).
Added:
xmlgraphics/commons/branches/TempNewImagePackage/lib/commons-logging-1.0.4.jar
- copied unchanged from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/lib/commons-logging-1.0.4.jar
xmlgraphics/commons/branches/TempNewImagePackage/lib/commons-logging.LICENSE.txt
- copied unchanged from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/lib/commons-logging.LICENSE.txt
xmlgraphics/commons/branches/TempNewImagePackage/lib/commons-logging.NOTICE.txt
- copied unchanged from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/lib/commons-logging.NOTICE.txt
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/Image.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/Image.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageContext.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageContext.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageException.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageException.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageFlavor.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageFlavor.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageInfo.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageInfo.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageManager.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageManager.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageProcessingHints.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageProcessingHints.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSessionContext.java
- copied, changed from r605150, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSessionContext.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSize.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSize.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSource.java
- copied, changed from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSource.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/
- copied from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/cache/
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/
- copied from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/impl/
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/package.html
- copied unchanged from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/package.html
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/pipeline/
- copied from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/pipeline/
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/spi/
- copied from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/spi/
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/util/
- copied from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/util/
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/java2d/CMYKColorSpace.java
- copied, changed from r605204, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/util/CMYKColorSpace.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/java2d/Graphics2DImagePainter.java
- copied, changed from r605202, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/render/Graphics2DImagePainter.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/MimeConstants.java
- copied, changed from r605201, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/apps/MimeConstants.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/UnitConv.java
- copied, changed from r605201, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/util/UnitConv.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/dijkstra/
- copied from r605151, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/util/dijkstra/
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/dijkstra/package.html (with props)
xmlgraphics/commons/branches/TempNewImagePackage/src/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
xmlgraphics/commons/branches/TempNewImagePackage/src/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
xmlgraphics/commons/branches/TempNewImagePackage/src/resources/META-INF/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
xmlgraphics/commons/branches/TempNewImagePackage/test/images/
xmlgraphics/commons/branches/TempNewImagePackage/test/images/asf-logo.png
- copied unchanged from r605213, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/examples/fo/graphics/asf-logo.png
xmlgraphics/commons/branches/TempNewImagePackage/test/images/barcode.eps
- copied unchanged from r605214, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/barcode.eps
xmlgraphics/commons/branches/TempNewImagePackage/test/images/bgimg300dpi.bmp
- copied unchanged from r605214, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/bgimg300dpi.bmp
xmlgraphics/commons/branches/TempNewImagePackage/test/images/bgimg300dpi.jpg
- copied unchanged from r605215, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/bgimg300dpi.jpg
xmlgraphics/commons/branches/TempNewImagePackage/test/images/bgimg72dpi.gif
- copied unchanged from r605214, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/bgimg72dpi.gif
xmlgraphics/commons/branches/TempNewImagePackage/test/images/big-image.png
- copied unchanged from r605214, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/big-image.png
xmlgraphics/commons/branches/TempNewImagePackage/test/images/cmyk.jpg
- copied unchanged from r605216, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/cmyk.jpg
xmlgraphics/commons/branches/TempNewImagePackage/test/images/img-with-tiff-preview.eps
- copied unchanged from r605214, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/img-with-tiff-preview.eps
xmlgraphics/commons/branches/TempNewImagePackage/test/images/img.emf
- copied unchanged from r605215, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/img.emf
xmlgraphics/commons/branches/TempNewImagePackage/test/images/no-resolution.bmp
- copied unchanged from r605216, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/no-resolution.bmp
xmlgraphics/commons/branches/TempNewImagePackage/test/images/no-resolution.tif
- copied unchanged from r605215, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/no-resolution.tif
xmlgraphics/commons/branches/TempNewImagePackage/test/images/tiff_group4.tif
- copied unchanged from r605215, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/resources/images/tiff_group4.tif
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/
- copied from r605206, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/DemoPainter.java (with props)
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/MockImageContext.java (with props)
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/MockImageSessionContext.java (with props)
Removed:
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/batik/
Modified:
xmlgraphics/commons/branches/TempNewImagePackage/lib/README.txt
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCache.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheListener.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageKey.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImage.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageConverter.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoader.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoaderFactory.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImagePreloader.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageSessionContext.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/CompositeImageLoader.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageBuffered.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBitmap2G2D.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBuffered2Rendered.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterG2D2Bitmap.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterRendered2PNG.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageGraphics2D.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderEPS.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryEPS.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRaw.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRawCCITTFax.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRaw.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawCCITTFax.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawCCITTFax.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawEPS.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawJPEG.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawStream.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageXMLDOM.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/JPEGConstants.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderBMP.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEMF.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEPS.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderGIF.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderJPEG.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderTIFF.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageIOUtil.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageLoaderFactoryImageIO.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageLoaderImageIO.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/PreloaderImageIO.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/pipeline/ImageConversionEdge.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/pipeline/ImageProviderPipeline.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/pipeline/ImageRepresentation.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/pipeline/PipelineFactory.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/spi/ImageConverter.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/spi/ImageImplRegistry.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/spi/ImageLoader.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/spi/ImageLoaderFactory.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/spi/ImagePreloader.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/util/ImageInputStreamAdapter.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/util/ImageUtil.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/util/SeekableStreamAdapter.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/util/SoftMapCache.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/util/SoftReferenceWithKey.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/dijkstra/DefaultEdgeDirectory.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/dijkstra/DijkstraAlgorithm.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/dijkstra/Edge.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/dijkstra/EdgeDirectory.java
xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/util/dijkstra/Vertex.java
xmlgraphics/commons/branches/TempNewImagePackage/status.xml
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/ImagePipelineTestCase.java
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/ImagePreloaderTestCase.java
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/ImageUtilTestCase.java
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheLoggingStatistics.java
xmlgraphics/commons/branches/TempNewImagePackage/test/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheTestCase.java
Modified: xmlgraphics/commons/branches/TempNewImagePackage/lib/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/lib/README.txt?rev=605222&r1=605221&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/lib/README.txt (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/lib/README.txt Tue Dec 18 07:03:41 2007
@@ -11,7 +11,7 @@
Normal Dependencies
----------------------
-- Apache Jakarta Commons IO
+- Apache Commons IO
commons-io-*.jar
http://jakarta.apache.org/commons/io/
@@ -20,65 +20,27 @@
Apache License v2.0
+- Apache Commons Logging
-Special Dependencies
------------------------
-
-The special dependencies are the whole JAXP set which required for users
-on JDK 1.3.x which doesn't include JAXP. But it is also interesting for
-users on JDKs >= 1.4 if they want to replace the default JAXP
-implementation delivered by the JDK.
-
-Replacing the default implementations involves understanding the
-"Endorsed Standards Override Mechanism".
-More information can be found here:
-http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html
-
-- JAXP API
-
- xml-apis.jar
- http://xml.apache.org/commons/components/external/
- (the JAXP API, plus SAX and various W3C DOM Java bindings,
- maintained in XML Commons Externals)
-
- Apache License v2.0 (applies to the distribution)
- SAX is in the public domain
- http://www.saxproject.org/copying.html
- W3C Software Notice and License (applies to the various DOM Java bindings)
- W3C Document License (applies to the DOM documentation)
- http://www.w3.org/Consortium/Legal/copyright-software
- http://www.w3.org/Consortium/Legal/copyright-documents
- http://www.w3.org/Consortium/Legal/
-
-- Apache Xerces-J
-
- xercesImpl-*.jar
- http://xerces.apache.org
- (JAXP-compliant XML parser and DOM Level 3 implementation)
+ commons-logging-*.jar
+ http://jakarta.apache.org/commons/logging/
+ (Logger abstraction)
Apache License v2.0
-- Apache Xalan-J
-
- xalan-*.jar and serializer-*.jar
- http://xalan.apache.org
- (JAXP-compliant XSLT and XPath implementation)
-
- Apache License v2.0 (applies to Xalan-J)
- Apache License v1.1 (applies to Apache BCEL and Apache REGEXP bundled in the JAR)
- Historical Permission Notice and Disclaimer (applies to CUP Parser Generator)
- http://www.opensource.org/licenses/historical.php
- (see xalan.runtime.LICENSE.txt)
+Special Dependencies
+-----------------------
+- JAXP 1.2 (Java 1.4 level)
Additional development-time dependencies
-------------------------------------------
-- Apache Ant
+- Apache Ant (1.6.5 or later)
(not bundled, requires pre-installation)
http://ant.apache.org
@@ -86,7 +48,7 @@
Apache License V2.0
-- JUnit
+- JUnit (3.8.1 or later)
(not bundled, provided by Apache Ant or your IDE)
http://www.junit.org
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/Image.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/Image.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/Image.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/Image.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/Image.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/Image.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/Image.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageContext.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageContext.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageContext.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageContext.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageContext.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageContext.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageContext.java Tue Dec 18 07:03:41 2007
@@ -17,8 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
-
+package org.apache.xmlgraphics.image.loader;
/**
* The ImageContext interface provides session-independent information (mainly configuration
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageException.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageException.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageException.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageException.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageException.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageException.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageException.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
/**
* Base class for all image-related exceptions.
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageFlavor.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageFlavor.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageFlavor.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageFlavor.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageFlavor.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageFlavor.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageFlavor.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
/**
* The flavor of an image indicates in which form it is available. A bitmap image loaded into
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageInfo.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageInfo.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageInfo.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageInfo.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageInfo.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageInfo.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageInfo.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
import java.util.Map;
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageManager.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageManager.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageManager.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageManager.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageManager.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageManager.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageManager.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
import java.io.IOException;
import java.util.Collections;
@@ -29,12 +29,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.image2.cache.ImageCache;
-import org.apache.fop.image2.pipeline.ImageProviderPipeline;
-import org.apache.fop.image2.pipeline.PipelineFactory;
-import org.apache.fop.image2.spi.ImageImplRegistry;
-import org.apache.fop.image2.spi.ImagePreloader;
-import org.apache.fop.image2.util.ImageUtil;
+import org.apache.xmlgraphics.image.loader.cache.ImageCache;
+import org.apache.xmlgraphics.image.loader.pipeline.ImageProviderPipeline;
+import org.apache.xmlgraphics.image.loader.pipeline.PipelineFactory;
+import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry;
+import org.apache.xmlgraphics.image.loader.spi.ImagePreloader;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
/**
* ImageManager is the central starting point for image access.
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageProcessingHints.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageProcessingHints.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageProcessingHints.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageProcessingHints.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageProcessingHints.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageProcessingHints.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageProcessingHints.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
/**
* This interface defines some standard hints to be used for image processing in this package.
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSessionContext.java (from r605150, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSessionContext.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSessionContext.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSessionContext.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSessionContext.java&r1=605150&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSessionContext.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSessionContext.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
import java.io.FileNotFoundException;
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSize.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSize.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSize.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSize.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSize.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSize.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSize.java Tue Dec 18 07:03:41 2007
@@ -17,12 +17,12 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
import java.awt.Dimension;
import java.awt.geom.Dimension2D;
-import org.apache.fop.util.UnitConv;
+import org.apache.xmlgraphics.util.UnitConv;
/**
* Encapsulates the size of an image.
Copied: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSource.java (from r605147, xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSource.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSource.java?p2=xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSource.java&p1=xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSource.java&r1=605147&r2=605222&rev=605222&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/image2/ImageSource.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/ImageSource.java Tue Dec 18 07:03:41 2007
@@ -17,14 +17,14 @@
/* $Id$ */
-package org.apache.fop.image2;
+package org.apache.xmlgraphics.image.loader;
import java.io.InputStream;
import javax.imageio.stream.ImageInputStream;
import javax.xml.transform.Source;
-import org.apache.fop.image2.util.ImageInputStreamAdapter;
+import org.apache.xmlgraphics.image.loader.util.ImageInputStreamAdapter;
/**
* Acts as a holder for the input to image loading operations.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCache.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCache.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCache.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCache.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.cache;
+package org.apache.xmlgraphics.image.loader.cache;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -29,13 +29,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageManager;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.util.SoftMapCache;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageManager;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.util.SoftMapCache;
+
/**
* This class provides a cache for images. The main key into the images is the original URI the
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheListener.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheListener.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheListener.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.cache;
+package org.apache.xmlgraphics.image.loader.cache;
import java.util.EventListener;
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageCacheStatistics.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.cache;
+package org.apache.xmlgraphics.image.loader.cache;
import java.util.Collections;
import java.util.Map;
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageKey.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageKey.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageKey.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/cache/ImageKey.java Tue Dec 18 07:03:41 2007
@@ -17,9 +17,9 @@
/* $Id$ */
-package org.apache.fop.image2.cache;
+package org.apache.xmlgraphics.image.loader.cache;
-import org.apache.fop.image2.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
/**
* Key class for Image instances in the cache.
@@ -27,7 +27,7 @@
public class ImageKey {
private String uri;
- private ImageFlavor flavor;
+ private org.apache.xmlgraphics.image.loader.ImageFlavor flavor;
/**
* Main constructor.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImage.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImage.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImage.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImage.java Tue Dec 18 07:03:41 2007
@@ -17,15 +17,15 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
import java.awt.color.ICC_Profile;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSize;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
/**
* Abstract base class for Image implementations.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageConverter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageConverter.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageConverter.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageConverter.java Tue Dec 18 07:03:41 2007
@@ -17,14 +17,13 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.spi.ImageConverter;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.spi.ImageConverter;
/**
- * This ImageConverter converts WMF images (represented by Batik's WMFRecordStore) to a
- * BufferedImage.
+ * Abstract base class for ImageConverter implementations.
*/
public abstract class AbstractImageConverter implements ImageConverter {
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoader.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoader.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoader.java Tue Dec 18 07:03:41 2007
@@ -17,15 +17,15 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.spi.ImageLoader;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.spi.ImageLoader;
/**
* Simple abstract base class for ImageLoaders.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoaderFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoaderFactory.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoaderFactory.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageLoaderFactory.java Tue Dec 18 07:03:41 2007
@@ -17,10 +17,10 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.spi.ImageLoaderFactory;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory;
/**
* Abstract base class for ImageLoaderFactory implementations.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImagePreloader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImagePreloader.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImagePreloader.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImagePreloader.java Tue Dec 18 07:03:41 2007
@@ -17,13 +17,13 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import javax.imageio.stream.ImageInputStream;
-import org.apache.fop.image2.spi.ImagePreloader;
+import org.apache.xmlgraphics.image.loader.spi.ImagePreloader;
/**
* Abstract base class for image preloaders. It provides helper methods for often-used tasks.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageSessionContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageSessionContext.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageSessionContext.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/AbstractImageSessionContext.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.File;
import java.io.FileNotFoundException;
@@ -37,10 +37,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.ImageSource;
-import org.apache.fop.image2.util.ImageUtil;
-import org.apache.fop.image2.util.SoftMapCache;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.ImageSource;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.image.loader.util.SoftMapCache;
/**
* Abstract base class for classes implementing ImageSessionContext. This class provides all the
@@ -89,6 +89,16 @@
if (source instanceof StreamSource) {
StreamSource streamSource = (StreamSource)source;
in = streamSource.getInputStream();
+ if (in == null) {
+ try {
+ in = new java.io.FileInputStream(f);
+ } catch (FileNotFoundException fnfe) {
+ log.error("Error while opening file."
+ + " Could not load image from system identifier '"
+ + source.getSystemId() + "' (" + fnfe.getMessage() + ")");
+ return null;
+ }
+ }
in = ImageUtil.decorateMarkSupported(in);
try {
if (ImageUtil.isGZIPCompressed(in)) {
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/CompositeImageLoader.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/CompositeImageLoader.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/CompositeImageLoader.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/CompositeImageLoader.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import java.util.Map;
@@ -25,12 +25,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.spi.ImageLoader;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.spi.ImageLoader;
/**
* Composite ImageLoader implementation in order to provide fallbacks when one ImageLoader
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageBuffered.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageBuffered.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageBuffered.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageBuffered.java Tue Dec 18 07:03:41 2007
@@ -17,13 +17,13 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.Color;
import java.awt.image.BufferedImage;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
/**
* This class is an implementation of the Image interface exposing a BufferedImage.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBitmap2G2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBitmap2G2D.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBitmap2G2D.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBitmap2G2D.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.Dimension;
import java.awt.Graphics2D;
@@ -26,10 +26,10 @@
import java.awt.geom.Rectangle2D;
import java.util.Map;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.render.Graphics2DImagePainter;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
/**
* This ImageConverter wraps a bitmap image in a Graphics2D image.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBuffered2Rendered.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBuffered2Rendered.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBuffered2Rendered.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterBuffered2Rendered.java Tue Dec 18 07:03:41 2007
@@ -17,12 +17,12 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.util.Map;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
/**
* This ImageConverter converts BufferedImages to RenderedImages (well, it's basically just a
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterG2D2Bitmap.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterG2D2Bitmap.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterG2D2Bitmap.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterG2D2Bitmap.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.Color;
import java.awt.Graphics2D;
@@ -34,11 +34,11 @@
import java.awt.image.WritableRaster;
import java.util.Map;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageProcessingHints;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.util.UnitConv;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageProcessingHints;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.util.UnitConv;
/**
* This ImageConverter converts Graphics2D images to a BufferedImage.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterRendered2PNG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterRendered2PNG.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterRendered2PNG.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageConverterRendered2PNG.java Tue Dec 18 07:03:41 2007
@@ -17,20 +17,20 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import java.util.Map;
import org.apache.commons.io.output.ByteArrayOutputStream;
+
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.writer.ImageWriter;
import org.apache.xmlgraphics.image.writer.ImageWriterParams;
import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
-
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageFlavor;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* This ImageConverter converts Rendered to PNG images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageGraphics2D.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageGraphics2D.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageGraphics2D.java Tue Dec 18 07:03:41 2007
@@ -17,11 +17,11 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.render.Graphics2DImagePainter;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
/**
* This class is an implementation of the Image interface exposing a Graphics2DImagePainter.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderEPS.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderEPS.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderEPS.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderEPS.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -25,15 +25,14 @@
import javax.xml.transform.Source;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.util.MimeConstants;
import org.apache.xmlgraphics.util.io.SubInputStream;
-
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.util.ImageUtil;
/**
* ImageLoader for EPS (Encapsulated PostScript) images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryEPS.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryEPS.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryEPS.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryEPS.java Tue Dec 18 07:03:41 2007
@@ -17,11 +17,11 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.spi.ImageLoader;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.spi.ImageLoader;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* Factory class for the ImageLoader for EPS (Encapsulated PostScript) images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRaw.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRaw.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRaw.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRaw.java Tue Dec 18 07:03:41 2007
@@ -17,11 +17,11 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.spi.ImageLoader;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.spi.ImageLoader;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* Factory class for the ImageLoader for raw/undecoded images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRawCCITTFax.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRawCCITTFax.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRawCCITTFax.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderFactoryRawCCITTFax.java Tue Dec 18 07:03:41 2007
@@ -17,14 +17,13 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import org.apache.xmlgraphics.image.codec.tiff.TIFFImage;
-
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.spi.ImageLoader;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.spi.ImageLoader;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* Factory class for the ImageLoader for raw/undecoded CCITT encoded images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRaw.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRaw.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRaw.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRaw.java Tue Dec 18 07:03:41 2007
@@ -17,19 +17,19 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import java.util.Map;
import javax.xml.transform.Source;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.util.ImageUtil;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
/**
* ImageLoader for formats consumed "raw" (undecoded). Provides a raw/undecoded stream.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawCCITTFax.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawCCITTFax.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawCCITTFax.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawCCITTFax.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.FilterInputStream;
import java.io.IOException;
@@ -29,21 +29,21 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.xmlgraphics.image.codec.tiff.TIFFDirectory;
import org.apache.xmlgraphics.image.codec.tiff.TIFFField;
import org.apache.xmlgraphics.image.codec.tiff.TIFFImage;
import org.apache.xmlgraphics.image.codec.tiff.TIFFImageDecoder;
import org.apache.xmlgraphics.image.codec.util.SeekableStream;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.image.loader.util.SeekableStreamAdapter;
+import org.apache.xmlgraphics.util.MimeConstants;
import org.apache.xmlgraphics.util.io.SubInputStream;
-
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.util.ImageUtil;
-import org.apache.fop.image2.util.SeekableStreamAdapter;
/**
* ImageLoader for CCITT group 3 and 4 images consumed "raw" (undecoded). Provides a
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderRawJPEG.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
@@ -31,14 +31,14 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.Image;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSessionContext;
-import org.apache.fop.image2.util.ImageUtil;
-import org.apache.fop.util.CMYKColorSpace;
+import org.apache.xmlgraphics.image.loader.Image;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSessionContext;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.java2d.CMYKColorSpace;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* ImageLoader for JPEG images consumed "raw" (undecoded). Provides a
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawCCITTFax.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawCCITTFax.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawCCITTFax.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawCCITTFax.java Tue Dec 18 07:03:41 2007
@@ -17,12 +17,12 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.color.ColorSpace;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
/**
* This class is an implementation of the Image interface exposing a 1-bit bitmap image stream
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawEPS.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawEPS.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawEPS.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawEPS.java Tue Dec 18 07:03:41 2007
@@ -17,13 +17,13 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.geom.Rectangle2D;
import java.io.InputStream;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
/**
* This class is an implementation of the Image interface exposing EPS file. It provides an
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawJPEG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawJPEG.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawJPEG.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawJPEG.java Tue Dec 18 07:03:41 2007
@@ -17,13 +17,13 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
/**
* This class is an implementation of the Image interface exposing a JPEG file. It provides an
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawStream.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawStream.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawStream.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRawStream.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.File;
import java.io.IOException;
@@ -26,8 +26,8 @@
import org.apache.commons.io.IOUtils;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
/**
* This class is an implementation of the Image interface exposing an InputStream for loading the
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageRendered.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.Color;
import java.awt.color.ColorSpace;
@@ -25,8 +25,8 @@
import java.awt.color.ICC_Profile;
import java.awt.image.RenderedImage;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
/**
* This class is an implementation of the Image interface exposing a RenderedImage.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageXMLDOM.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageXMLDOM.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageXMLDOM.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/ImageXMLDOM.java Tue Dec 18 07:03:41 2007
@@ -17,12 +17,12 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import org.w3c.dom.Document;
-import org.apache.fop.image2.ImageFlavor;
-import org.apache.fop.image2.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageFlavor;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
/**
* This class is an implementation of the Image interface exposing an XML DOM (W3C).
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/JPEGConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/JPEGConstants.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/JPEGConstants.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/JPEGConstants.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
/**
* Constants for JPEG images
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderBMP.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderBMP.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderBMP.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderBMP.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import java.nio.ByteOrder;
@@ -25,12 +25,12 @@
import javax.imageio.stream.ImageInputStream;
import javax.xml.transform.Source;
-import org.apache.fop.image2.ImageContext;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.image2.util.ImageUtil;
-import org.apache.fop.util.UnitConv;
+import org.apache.xmlgraphics.image.loader.ImageContext;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.util.UnitConv;
/**
* Image preloader for BMP images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEMF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEMF.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEMF.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEMF.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import java.nio.ByteOrder;
@@ -25,12 +25,12 @@
import javax.imageio.stream.ImageInputStream;
import javax.xml.transform.Source;
-import org.apache.fop.image2.ImageContext;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.image2.util.ImageUtil;
-import org.apache.fop.util.UnitConv;
+import org.apache.xmlgraphics.image.loader.ImageContext;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.util.UnitConv;
/**
* Image preloader for EMF images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEPS.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEPS.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEPS.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderEPS.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
@@ -26,6 +26,11 @@
import javax.imageio.stream.ImageInputStream;
import javax.xml.transform.Source;
+import org.apache.xmlgraphics.image.loader.ImageContext;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.util.ImageInputStreamAdapter;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
import org.apache.xmlgraphics.ps.DSCConstants;
import org.apache.xmlgraphics.ps.dsc.DSCException;
import org.apache.xmlgraphics.ps.dsc.DSCParser;
@@ -33,13 +38,7 @@
import org.apache.xmlgraphics.ps.dsc.events.DSCComment;
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentBoundingBox;
import org.apache.xmlgraphics.ps.dsc.events.DSCEvent;
-
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.ImageContext;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.image2.util.ImageInputStreamAdapter;
-import org.apache.fop.image2.util.ImageUtil;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* Image preloader for EPS images (Encapsulated PostScript).
@@ -64,6 +63,7 @@
EPSBinaryFileHeader binaryHeader = null;
try {
long magic = in.readUnsignedInt();
+ magic &= 0xFFFFFFFFL; //Work-around for bug in Java 1.4.2
// Check if binary header
boolean supported = false;
if (magic == 0xC6D3D0C5L) {
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderGIF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderGIF.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderGIF.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderGIF.java Tue Dec 18 07:03:41 2007
@@ -17,18 +17,18 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import javax.imageio.stream.ImageInputStream;
import javax.xml.transform.Source;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.ImageContext;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.image2.util.ImageUtil;
+import org.apache.xmlgraphics.image.loader.ImageContext;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* Image preloader for GIF images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderJPEG.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderJPEG.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderJPEG.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderJPEG.java Tue Dec 18 07:03:41 2007
@@ -17,19 +17,19 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
import javax.imageio.stream.ImageInputStream;
import javax.xml.transform.Source;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.ImageContext;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.image2.util.ImageUtil;
+import org.apache.xmlgraphics.image.loader.ImageContext;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.util.MimeConstants;
/**
* Image preloader for JPEG images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderTIFF.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderTIFF.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderTIFF.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/PreloaderTIFF.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl;
+package org.apache.xmlgraphics.image.loader.impl;
import java.io.IOException;
@@ -28,15 +28,14 @@
import org.apache.xmlgraphics.image.codec.tiff.TIFFField;
import org.apache.xmlgraphics.image.codec.tiff.TIFFImageDecoder;
import org.apache.xmlgraphics.image.codec.util.SeekableStream;
-
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.image2.ImageContext;
-import org.apache.fop.image2.ImageException;
-import org.apache.fop.image2.ImageInfo;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.image2.util.ImageUtil;
-import org.apache.fop.image2.util.SeekableStreamAdapter;
-import org.apache.fop.util.UnitConv;
+import org.apache.xmlgraphics.image.loader.ImageContext;
+import org.apache.xmlgraphics.image.loader.ImageException;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+import org.apache.xmlgraphics.image.loader.util.SeekableStreamAdapter;
+import org.apache.xmlgraphics.util.MimeConstants;
+import org.apache.xmlgraphics.util.UnitConv;
/**
* Image preloader for TIFF images.
Modified: xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageIOUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageIOUtil.java?rev=605222&r1=605147&r2=605222&view=diff
==============================================================================
--- xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageIOUtil.java (original)
+++ xmlgraphics/commons/branches/TempNewImagePackage/src/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageIOUtil.java Tue Dec 18 07:03:41 2007
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.fop.image2.impl.imageio;
+package org.apache.xmlgraphics.image.loader.impl.imageio;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataFormatImpl;
@@ -33,8 +33,8 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.apache.fop.image2.ImageSize;
-import org.apache.fop.util.UnitConv;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.util.UnitConv;
/**
* Helper and convenience methods for ImageIO.
---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org