aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2009-08-02 19:13:26 +0000
committerJeremias Maerki <jeremias@apache.org>2009-08-02 19:13:26 +0000
commitcdd66d9c228cd73b7177f5e3eb61ffbb54a93e45 (patch)
treeada8a542fdaa6e7a349777cbd28db4f941f4efad
parentba8c6840fba8e84780a44bf4e6da45f97f6fb283 (diff)
downloadxmlgraphics-fop-cdd66d9c228cd73b7177f5e3eb61ffbb54a93e45.tar.gz
xmlgraphics-fop-cdd66d9c228cd73b7177f5e3eb61ffbb54a93e45.zip
Reverted changes in rev 797899 (but xgc.jar updated rather than reverted)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@800133 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--lib/xmlgraphics-commons-1.4svn.jarbin551823 -> 552758 bytes
-rw-r--r--src/java/org/apache/fop/afp/AFPGraphics2D.java2
-rw-r--r--src/java/org/apache/fop/svg/PDFGraphics2D.java2
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/xmlgraphics-commons-1.4svn.jar b/lib/xmlgraphics-commons-1.4svn.jar
index fc9ce636b..7624e0a42 100644
--- a/lib/xmlgraphics-commons-1.4svn.jar
+++ b/lib/xmlgraphics-commons-1.4svn.jar
Binary files differ
diff --git a/src/java/org/apache/fop/afp/AFPGraphics2D.java b/src/java/org/apache/fop/afp/AFPGraphics2D.java
index 5aa7a47ef..2e176e5ab 100644
--- 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, null);
+ ImageRendered imageRendered = new ImageRendered(imageInfo, img, 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 d81a9aab1..c5da8af6f 100644
--- 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, null);
+ ImageRendered imgRend = new ImageRendered(info, img, null);
ImageRenderedAdapter adapter = new ImageRenderedAdapter(imgRend, key);
PDFXObject xObject = pdfDoc.addImage(resourceContext, adapter);
flushPDFDocument();