Fixed an IF serialization bug and an AFP image regression

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

diff --git a/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java b/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
index 3e0780cbf246d11f186314b6b6ff9be91babd3e1..3adbd68f619afadc993fab73cc9bb66f81bc1751 100644 (file)
--- a/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
+++ b/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
@@ -201,6 +201,7 @@ public class AFPImageHandlerRenderedImage extends AFPImageHandler implements Ima
             ImageInfo imageInfo = imageRendered.getInfo();
             this.intrinsicSize = imageInfo.getSize();
             this.effIntrinsicSize = intrinsicSize;
+            effIntrinsicSize.setSizeInPixels(renderedImage.getWidth(), renderedImage.getHeight());
 
             AFPResourceInfo resourceInfo = imageObjectInfo.getResourceInfo();
             this.usePageSegments = useFS10 && !resourceInfo.getLevel().isInline();

diff --git a/src/java/org/apache/fop/render/intermediate/IFSerializer.java b/src/java/org/apache/fop/render/intermediate/IFSerializer.java
index 28a22779ac8c1c70a5295a75a19e573949c4afbe..24239e5f4bb4913920620065476a8b6aac198816 100644 (file)
--- a/src/java/org/apache/fop/render/intermediate/IFSerializer.java
+++ b/src/java/org/apache/fop/render/intermediate/IFSerializer.java
@@ -31,7 +31,6 @@ import java.util.Locale;
 import java.util.Map;
 
 import org.w3c.dom.Document;
-
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
@@ -531,16 +530,16 @@ implements IFConstants, IFPainter, IFDocumentNavigationHandler {
             if (hasRoundedCorners(bpsBefore, bpsAfter, bpsStart, bpsEnd)) {
 
                 if (bpsBefore != null) {
-                    addAttribute(atts, "before", bpsBefore.toString());
+                    addAttribute(atts, "top", bpsBefore.toString());
                 }
                 if (bpsAfter != null) {
-                    addAttribute(atts, "after", bpsAfter.toString());
+                    addAttribute(atts, "bottom", bpsAfter.toString());
                 }
                 if (bpsStart != null) {
-                    addAttribute(atts, "start", bpsStart.toString());
+                    addAttribute(atts, "left", bpsStart.toString());
                 }
                 if (bpsEnd != null) {
-                    addAttribute(atts, "end", bpsEnd.toString());
+                    addAttribute(atts, "right", bpsEnd.toString());
                 }
             }
             handler.element(EL_CLIP_RECT, atts);