Author: cbowditch
Date: Tue Mar 5 15:45:13 2013
New Revision: 1452859
URL: http://svn.apache.org/r1452859
Log:
FOP-2217; Image scaling change was adversely affecting other image types
Submitted by Robert Meyer (rmeyer.at.hotmail.co.uk)
Removed:
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutmgr/inline/
Modified:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-svn-trunk.jar?rev=1452859&r1=1452858&r2=1452859&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java?rev=1452859&r1=1452858&r2=1452859&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
Tue Mar 5 15:45:13 2013
@@ -145,7 +145,8 @@ public class SVGElement extends SVGObj {
Point2D p2d = getSize(fontSize, svgRoot,
getUserAgent().getSourcePixelUnitToMillimeter());
e.setSVGContext(null);
- return p2d;
+ double pixelToPoint = 72d / getUserAgent().getSourceResolution();
+ return new Point2D.Double(p2d.getX() * pixelToPoint, p2d.getY() *
pixelToPoint);
}
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java?rev=1452859&r1=1452858&r2=1452859&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
Tue Mar 5 15:45:13 2013
@@ -25,14 +25,10 @@ import java.awt.Rectangle;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.xmlgraphics.util.UnitConv;
-
import org.apache.fop.datatypes.Length;
import org.apache.fop.datatypes.PercentBaseContext;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.GraphicsProperties;
-import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.flow.AbstractGraphics;
import org.apache.fop.fo.properties.LengthRangeProperty;
/**
@@ -102,9 +98,9 @@ public class ImageLayout implements Cons
boolean constrainIntrinsicSize = false;
int cwidth = -1;
int cheight = -1;
- Length lenWidth = props.getContentWidth();
- if (lenWidth.getEnum() != EN_AUTO) {
- switch (lenWidth.getEnum()) {
+ len = props.getContentWidth();
+ if (len.getEnum() != EN_AUTO) {
+ switch (len.getEnum()) {
case EN_SCALE_TO_FIT:
if (ipd != -1) {
cwidth = ipd;
@@ -124,12 +120,12 @@ public class ImageLayout implements Cons
constrainIntrinsicSize = true;
break;
default:
- cwidth = lenWidth.getValue(percentBaseContext);
+ cwidth = len.getValue(percentBaseContext);
}
}
- Length lenHeight = props.getContentHeight();
- if (lenHeight.getEnum() != EN_AUTO) {
- switch (lenHeight.getEnum()) {
+ len = props.getContentHeight();
+ if (len.getEnum() != EN_AUTO) {
+ switch (len.getEnum()) {
case EN_SCALE_TO_FIT:
if (bpd != -1) {
cheight = bpd;
@@ -149,21 +145,10 @@ public class ImageLayout implements Cons
constrainIntrinsicSize = true;
break;
default:
- cheight = lenHeight.getValue(percentBaseContext);
+ cheight = len.getValue(percentBaseContext);
}
}
- //If no content-width or height is specified, adjust dimensions based
upon the source resolution
- int sourceResolution = 72;
- if (props instanceof AbstractGraphics) {
- sourceResolution = (int)
((AbstractGraphics)props).getUserAgent().getSourceResolution();
- }
- boolean foundNonAuto = (lenWidth.getEnum() != EN_AUTO ||
lenHeight.getEnum() != EN_AUTO);
- if (!foundNonAuto) {
- cwidth = (int)(intrinsicSize.width / ((float)sourceResolution /
(float)UnitConv.IN2PT));
- cheight = (int)(intrinsicSize.height / ((float)sourceResolution /
(float)UnitConv.IN2PT));
- }
-
Dimension constrainedIntrinsicSize;
if (constrainIntrinsicSize) {
constrainedIntrinsicSize = constrain(intrinsicSize);
@@ -179,13 +164,11 @@ public class ImageLayout implements Cons
//Adjust viewport if not explicit
if (ipd == -1) {
ipd = constrainExtent(cwidth,
- props.getInlineProgressionDimension(), (foundNonAuto)
- ? props.getContentWidth() : new DefaultLength());
+ props.getInlineProgressionDimension(),
props.getContentWidth());
}
if (bpd == -1) {
bpd = constrainExtent(cheight,
- props.getBlockProgressionDimension(), (foundNonAuto)
- ? props.getContentHeight() : new DefaultLength());
+ props.getBlockProgressionDimension(),
props.getContentHeight());
}
this.clip = false;
@@ -208,36 +191,6 @@ public class ImageLayout implements Cons
this.placement = new Rectangle(xoffset, yoffset, cwidth, cheight);
}
- private static class DefaultLength implements Length {
- public double getNumericValue() throws PropertyException {
- return 0;
- }
-
- public double getNumericValue(PercentBaseContext context) throws
PropertyException {
- return 0;
- }
-
- public int getDimension() {
- return 0;
- }
-
- public boolean isAbsolute() {
- return false;
- }
-
- public int getEnum() {
- return 0;
- }
-
- public int getValue() {
- return 0;
- }
-
- public int getValue(PercentBaseContext context) {
- return 0;
- }
- }
-
private int constrainExtent(int extent, LengthRangeProperty range, Length
contextExtent) {
boolean mayScaleUp = (contextExtent.getEnum() != EN_SCALE_DOWN_TO_FIT);
boolean mayScaleDown = (contextExtent.getEnum() != EN_SCALE_UP_TO_FIT);
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1452859&r1=1452858&r2=1452859&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Mar 5 15:45:13 2013
@@ -59,6 +59,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Layout" dev="CB" type="fix" fixes-bug="FOP-2217"
due-to="Robert Meyer">
+ Image scaling change was adversely affecting other image types
+ </action>
<action context="Renderers" dev="CB" type="fix" fixes-bug="FOP-2214"
due-to="Simon Steiner">
Thin dashed border look like dots
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
