Fixes GUMP build problems, the automated e-mail was starting to annoy so I scratched...

* Updated xmlgraphics-commons to trunk version.
* Fixed ImageRendered constructor call in PDFGraphics2D and AFPGraphics2D to be compatible with the new parameter that has been added in xmlgraphics-commons.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@797899 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/xmlgraphics-commons-1.4svn.jar b/lib/xmlgraphics-commons-1.4svn.jar
index 9e88ef4e2bfe35ce36214f2ec135ebb0b89ac34a..fc9ce636b2db8a5c31b663f95963c653473ef6b0 100644 (file)
Binary files a/lib/xmlgraphics-commons-1.4svn.jar and b/lib/xmlgraphics-commons-1.4svn.jar differ

diff --git a/src/java/org/apache/fop/afp/AFPGraphics2D.java b/src/java/org/apache/fop/afp/AFPGraphics2D.java
index 2e176e5ab0bed32127dd6158fe1980056282a3f0..5aa7a47efe013649f09b3771436d693857e809dc 100644 (file)
--- a/src/java/org/apache/fop/afp/AFPGraphics2D.java
+++ b/src/java/org/apache/fop/afp/AFPGraphics2D.java
@@ -548,7 +548,7 @@ public class AFPGraphics2D extends AbstractGraphics2D implements NativeImageHand
         ImageSize size = new ImageSize(img.getWidth(), img.getHeight(), 72);
         imageInfo.setSize(size);
 
-        ImageRendered imageRendered = new ImageRendered(imageInfo, img, null);
+        ImageRendered imageRendered = new ImageRendered(imageInfo, img, null, null);
         RenderedImage renderedImage = imageRendered.getRenderedImage();
 
         // create image object info

diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java
index c5da8af6f4363d14ab92e0c4f3153d1627bd12cd..d81a9aab1d3a7990c8ed283e4bdafa7e38fa644f 100644 (file)
--- a/src/java/org/apache/fop/svg/PDFGraphics2D.java
+++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java
@@ -1259,7 +1259,7 @@ public class PDFGraphics2D extends AbstractGraphics2D implements NativeImageHand
         ImageInfo info = new ImageInfo(null, "image/unknown");
         ImageSize size = new ImageSize(img.getWidth(), img.getHeight(), 72);
         info.setSize(size);
-        ImageRendered imgRend = new ImageRendered(info, img, null);
+        ImageRendered imgRend = new ImageRendered(info, img, null, null);
         ImageRenderedAdapter adapter = new ImageRenderedAdapter(imgRend, key);
         PDFXObject xObject = pdfDoc.addImage(resourceContext, adapter);
         flushPDFDocument();