Parcourir la source

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
tags/fop-2_0
Peter Hancock il y a 11 ans
Parent
révision
3e96fb119f

+ 1
- 0
src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java Voir le fichier

ImageInfo imageInfo = imageRendered.getInfo(); ImageInfo imageInfo = imageRendered.getInfo();
this.intrinsicSize = imageInfo.getSize(); this.intrinsicSize = imageInfo.getSize();
this.effIntrinsicSize = intrinsicSize; this.effIntrinsicSize = intrinsicSize;
effIntrinsicSize.setSizeInPixels(renderedImage.getWidth(), renderedImage.getHeight());


AFPResourceInfo resourceInfo = imageObjectInfo.getResourceInfo(); AFPResourceInfo resourceInfo = imageObjectInfo.getResourceInfo();
this.usePageSegments = useFS10 && !resourceInfo.getLevel().isInline(); this.usePageSegments = useFS10 && !resourceInfo.getLevel().isInline();

+ 4
- 5
src/java/org/apache/fop/render/intermediate/IFSerializer.java Voir le fichier

import java.util.Map; import java.util.Map;


import org.w3c.dom.Document; import org.w3c.dom.Document;

import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.AttributesImpl;


if (hasRoundedCorners(bpsBefore, bpsAfter, bpsStart, bpsEnd)) { if (hasRoundedCorners(bpsBefore, bpsAfter, bpsStart, bpsEnd)) {


if (bpsBefore != null) { if (bpsBefore != null) {
addAttribute(atts, "before", bpsBefore.toString());
addAttribute(atts, "top", bpsBefore.toString());
} }
if (bpsAfter != null) { if (bpsAfter != null) {
addAttribute(atts, "after", bpsAfter.toString());
addAttribute(atts, "bottom", bpsAfter.toString());
} }
if (bpsStart != null) { if (bpsStart != null) {
addAttribute(atts, "start", bpsStart.toString());
addAttribute(atts, "left", bpsStart.toString());
} }
if (bpsEnd != null) { if (bpsEnd != null) {
addAttribute(atts, "end", bpsEnd.toString());
addAttribute(atts, "right", bpsEnd.toString());
} }
} }
handler.element(EL_CLIP_RECT, atts); handler.element(EL_CLIP_RECT, atts);

Chargement…
Annuler
Enregistrer