diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2009-04-12 19:54:03 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2009-04-12 19:54:03 +0000 |
| commit | f31c3fbd4ba6f6720a9ddc41026e7d2c8fd79793 (patch) | |
| tree | deb2fca0060f1b52db32b80d2b1f7a4853d87bd7 /src | |
| parent | 4d9f95a6afdf8c1d0710d2c854fb63a4ead2b0fb (diff) | |
| download | xmlgraphics-fop-f31c3fbd4ba6f6720a9ddc41026e7d2c8fd79793.tar.gz xmlgraphics-fop-f31c3fbd4ba6f6720a9ddc41026e7d2c8fd79793.zip | |
Fix the behaviour of pixel-lengths: influenced by target-resolution, rather than source-resolution (which is meant for images)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@764317 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/org/apache/fop/fo/expr/PropertyParser.java | 6 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/LengthProperty.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/fo/expr/PropertyParser.java b/src/java/org/apache/fop/fo/expr/PropertyParser.java index 7ae1db7f3..4f1cdbdc6 100644 --- a/src/java/org/apache/fop/fo/expr/PropertyParser.java +++ b/src/java/org/apache/fop/fo/expr/PropertyParser.java @@ -99,7 +99,7 @@ public final class PropertyParser extends PropertyTokenizer { /** * Private constructor. Called by the static parse() method. * @param propExpr The specified value (attribute on the xml element). - * @param propInfo A PropertyInfo object representing the context in + * @param pInfo A PropertyInfo object representing the context in * which the property expression is to be evaluated. */ private PropertyParser(String propExpr, PropertyInfo pInfo) { @@ -310,12 +310,12 @@ public final class PropertyParser extends PropertyTokenizer { propInfo.currentFontSize()); } else { if ("px".equals(unitPart)) { - //pass the ratio between source-resolution and + //pass the ratio between target-resolution and //the default resolution of 72dpi prop = FixedLength.getInstance( numPart, unitPart, propInfo.getPropertyList().getFObj() - .getUserAgent().getSourceResolution() / 72.0f); + .getUserAgent().getTargetResolution() / 72.0f); } else { //use default resolution of 72dpi prop = FixedLength.getInstance(numPart, unitPart); diff --git a/src/java/org/apache/fop/fo/properties/LengthProperty.java b/src/java/org/apache/fop/fo/properties/LengthProperty.java index 4ffe38074..16bbe430c 100644 --- a/src/java/org/apache/fop/fo/properties/LengthProperty.java +++ b/src/java/org/apache/fop/fo/properties/LengthProperty.java @@ -59,7 +59,7 @@ public abstract class LengthProperty extends Property //Assume pixels (like in HTML) when there's no unit return FixedLength.getInstance( p.getNumeric().getNumericValue(), "px", - propertyList.getFObj().getUserAgent().getSourceResolution() / 72.0f); + propertyList.getFObj().getUserAgent().getTargetResolution() / 72.0f); } Length val = p.getLength(); if (val != null) { |