]> source.dussan.org Git - xmlgraphics-fop.git/commit
projects / xmlgraphics-fop.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d339f0 f9d4720)
Merge from Trunk revisions 719662 - 724689.
authorJeremias Maerki <jeremias@apache.org>
Tue, 9 Dec 2008 15:00:35 +0000 (15:00 +0000)
committerJeremias Maerki <jeremias@apache.org>
Tue, 9 Dec 2008 15:00:35 +0000 (15:00 +0000)
commita6ddced309701a1ca8d79a9e7bec3288afba2cc8
treec3d2bcfe7277246d9a2acc3675721a99f4de5727tree | snapshot
parent9d339f0968314f0cfcc4a720628fed1845292ce1commit | diff
parentf9d4720b99f5e0fb423b097d7207dfab446d911ccommit | diff
Merge from Trunk revisions 719662 - 724689.
Conflict for ImageHandler interface resolved by renaming Trunk's ImageHandler to ImageHandlerBase and extending the other ImageHandler from that.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@724729 13f79535-47bb-0310-9956-ffa450edef68
23 files changed:
build.xml diff1 | diff2 | blob | history
src/java/org/apache/fop/apps/MimeConstants.java diff1 | diff2 | blob | history
src/java/org/apache/fop/events/EventFormatter.xml diff1 | diff2 | blob | history
src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java | diff2 | blob | history
src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/AbstractRenderer.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/ImageHandler.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/ImageHandlerBase.java | | blob
src/java/org/apache/fop/render/PrintRenderer.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/afp/AFPEventProducer.xml diff1 | | blob | history
src/java/org/apache/fop/render/afp/AFPImageHandler.java | diff2 | blob | history
src/java/org/apache/fop/render/java2d/Java2DRenderer.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pcl/PCLRenderer.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pdf/PDFContentGenerator.java diff1 | | blob | history
src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pdf/PDFImageHandler.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pdf/PDFImageHandlerSVG.java diff1 | | blob | history
src/java/org/apache/fop/render/pdf/PDFRenderer.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pdf/PDFRendererContextConstants.java diff1 | diff2 | blob | history
src/java/org/apache/fop/render/pdf/PDFSVGHandler.java diff1 | diff2 | blob | history
src/java/org/apache/fop/svg/PDFGraphics2D.java diff1 | diff2 | blob | history
Apache XML Graphics FOP: https://github.com/apache/xmlgraphics-fop