Author: phancock
Date: Mon Aug 13 12:22:47 2012
New Revision: 1372388
URL: http://svn.apache.org/viewvc?rev=1372388&view=rev
Log:
Fixed an IF serialization bug and an AFP image regression
Modified:
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/intermediate/IFSerializer.java
Modified:
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java?rev=1372388&r1=1372387&r2=1372388&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
(original)
+++
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
Mon Aug 13 12:22:47 2012
@@ -201,6 +201,7 @@ public class AFPImageHandlerRenderedImag
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();
Modified:
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/intermediate/IFSerializer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=1372388&r1=1372387&r2=1372388&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/intermediate/IFSerializer.java
(original)
+++
xmlgraphics/fop/branches/Temp_RoundedCorners/src/java/org/apache/fop/render/intermediate/IFSerializer.java
Mon Aug 13 12:22:47 2012
@@ -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, IFDoc
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
