projects
/
gpl
/
argeo-slc.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ddf81cb
)
Add PDF image to FOP
author
Mathieu Baudier <mbaudier@argeo.org>
Wed, 25 May 2022 04:26:15 +0000
(06:26 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Wed, 25 May 2022 04:26:15 +0000
(06:26 +0200)
tp/org.argeo.tp.apache/xmlgraphics/merge.bnd
patch
|
blob
|
history
tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageConverter
patch
|
blob
|
history
tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImageLoaderFactory
patch
|
blob
|
history
tp/org.argeo.tp.apache/xmlgraphics/services/org.apache.xmlgraphics.image.loader.spi.ImagePreloader
patch
|
blob
|
history
tp/org.argeo.tp.formats/fop/merge.bnd
patch
|
blob
|
history
diff --git
a/tp/org.argeo.tp.apache/xmlgraphics/merge.bnd
b/tp/org.argeo.tp.apache/xmlgraphics/merge.bnd
index ec4b5b594dcaa4ce9b776825f50d4731961a90df..8cb1d14512b8dd973097a434754fab86b724d378 100644
(file)
--- 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", \
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 045f6515f3e00675f466eca91e9bd2a187b87d66..292f716d04991d3e65dc0086c0ed48cc433374aa 100644
(file)
--- 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.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 9e0bd6048900c3ad08252a0d2c968f64550fb8e9..27dc74aa0acb3b691de56f233405651b6b1342f7 100644
(file)
--- 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.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 5644f2259e8bd63f58ee119e5556159a5a8e9825..82f7977b6aa8e47d9348291cce928084033254bf 100644
(file)
--- 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.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 96c438a63f010534b60a6b81542c7790b8ce33b0..b8f65482b13075b3245aaae3a9da5a6890318f87 100644
(file)
--- 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-core,\
org.apache.xmlgraphics:fop-util,\
org.apache.xmlgraphics:fop-events,\
+org.apache.xmlgraphics:fop-pdf-images,\
Export-Package: org.apache.fop.*
Export-Package: org.apache.fop.*