From c4f781b8b343eb0c72e774114e8e8efcde750b7f Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 25 May 2022 06:26:15 +0200 Subject: [PATCH] Add PDF image to FOP --- tp/org.argeo.tp.apache/xmlgraphics/merge.bnd | 1 + .../org.apache.xmlgraphics.image.loader.spi.ImageConverter | 2 ++ .../org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory | 2 ++ .../org.apache.xmlgraphics.image.loader.spi.ImagePreloader | 3 +++ tp/org.argeo.tp.formats/fop/merge.bnd | 1 + 5 files changed, 9 insertions(+) diff --git a/tp/org.argeo.tp.apache/xmlgraphics/merge.bnd b/tp/org.argeo.tp.apache/xmlgraphics/merge.bnd index ec4b5b594..8cb1d1451 100644 --- a/tp/org.argeo.tp.apache/xmlgraphics/merge.bnd +++ b/tp/org.argeo.tp.apache/xmlgraphics/merge.bnd @@ -6,5 +6,6 @@ org.apache.xmlgraphics:xmlgraphics-commons Export-Package: org.apache.xmlgraphics.* Import-Package: \ org.apache.fop.image.loader.batik;resolution:="optional", \ +org.apache.fop.render.pdf.pdfbox;resolution:="optional", \ * diff --git a/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter b/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter index 045f6515f..292f716d0 100644 --- a/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter +++ b/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter @@ -1,3 +1,5 @@ org.apache.fop.image.loader.batik.ImageConverterSVG2G2D org.apache.fop.image.loader.batik.ImageConverterG2D2SVG org.apache.fop.image.loader.batik.ImageConverterWMF2G2D +org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2AFP +org.apache.fop.render.pdf.pdfbox.ImageConverterPDF2G2D \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory b/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory index 9e0bd6048..27dc74aa0 100644 --- a/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory +++ b/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory @@ -1,2 +1,4 @@ org.apache.fop.image.loader.batik.ImageLoaderFactorySVG org.apache.fop.image.loader.batik.ImageLoaderFactoryWMF +org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryPDF +org.apache.fop.render.pdf.pdfbox.ImageLoaderFactoryImageRawData \ No newline at end of file diff --git a/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader b/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader index 5644f2259..82f7977b6 100644 --- a/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader +++ b/tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader @@ -1,2 +1,5 @@ org.apache.fop.image.loader.batik.PreloaderWMF org.apache.fop.image.loader.batik.PreloaderSVG +org.apache.fop.render.pdf.pdfbox.PreloaderPDF +org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData +org.apache.fop.render.pdf.pdfbox.LastResortPreloaderPDF \ No newline at end of file diff --git a/tp/org.argeo.tp.formats/fop/merge.bnd b/tp/org.argeo.tp.formats/fop/merge.bnd index 96c438a63..b8f65482b 100644 --- a/tp/org.argeo.tp.formats/fop/merge.bnd +++ b/tp/org.argeo.tp.formats/fop/merge.bnd @@ -5,6 +5,7 @@ SLC-Origin-M2-Merge: \ org.apache.xmlgraphics:fop-core,\ org.apache.xmlgraphics:fop-util,\ org.apache.xmlgraphics:fop-events,\ +org.apache.xmlgraphics:fop-pdf-images,\ Export-Package: org.apache.fop.* -- 2.30.2