You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2008/02/25 10:17:45 UTC
svn commit: r630772 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
test/layoutengine/standard-testcases/external-graphic_size_2.xml
Author: jeremias
Date: Mon Feb 25 01:17:43 2008
New Revision: 630772
URL: http://svn.apache.org/viewvc?rev=630772&view=rev
Log:
Bugfix: When scale-up/down-to-fit was used, the image scaling rule was not always respected.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml (with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
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=630772&r1=630771&r2=630772&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 Mon Feb 25 01:17:43 2008
@@ -163,10 +163,12 @@
//Adjust viewport if not explicit
if (ipd == -1) {
- ipd = constrainExtent(cwidth, props.getInlineProgressionDimension());
+ ipd = constrainExtent(cwidth,
+ props.getInlineProgressionDimension(), props.getContentWidth());
}
if (bpd == -1) {
- bpd = constrainExtent(cheight, props.getBlockProgressionDimension());
+ bpd = constrainExtent(cheight,
+ props.getBlockProgressionDimension(), props.getContentHeight());
}
this.clip = false;
@@ -189,19 +191,21 @@
this.placement = new Rectangle(xoffset, yoffset, cwidth, cheight);
}
- private int constrainExtent(int extent, LengthRangeProperty range) {
+ 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);
Length len;
len = range.getMaximum(percentBaseContext).getLength();
if (len.getEnum() != EN_AUTO) {
int max = len.getValue(percentBaseContext);
- if (max != -1) {
+ if (max != -1 && mayScaleDown) {
extent = Math.min(extent, max);
}
}
len = range.getMinimum(percentBaseContext).getLength();
if (len.getEnum() != EN_AUTO) {
int min = len.getValue(percentBaseContext);
- if (min != -1) {
+ if (min != -1 && mayScaleUp) {
extent = Math.max(extent, min);
}
}
@@ -210,8 +214,10 @@
private Dimension constrain(Dimension size) {
Dimension adjusted = new Dimension(size);
- int effWidth = constrainExtent(size.width, props.getInlineProgressionDimension());
- int effHeight = constrainExtent(size.height, props.getBlockProgressionDimension());
+ int effWidth = constrainExtent(size.width,
+ props.getInlineProgressionDimension(), props.getContentWidth());
+ int effHeight = constrainExtent(size.height,
+ props.getBlockProgressionDimension(), props.getContentHeight());
int scaling = props.getScaling();
if (scaling == EN_UNIFORM) {
double rat1 = (double)effWidth / size.width;
Added: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml?rev=630772&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml (added)
+++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml Mon Feb 25 01:17:43 2008
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ This test checks external-graphics with size properties.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/box1.png"
+ overflow="hidden" background-color="yellow" id="box-org"/>
+ </fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/box1.png"
+ inline-progression-dimension="1in"
+ block-progression-dimension="1in"
+ content-width="scale-down-to-fit"
+ content-height="scale-down-to-fit"
+ text-align="center" display-align="center"
+ overflow="hidden" background-color="yellow" id="box1"/>
+ <fo:external-graphic src="../../resources/images/box1.png"
+ inline-progression-dimension="0.5in"
+ block-progression-dimension="0.5in"
+ content-width="scale-up-to-fit"
+ content-height="scale-up-to-fit"
+ text-align="center" display-align="center"
+ overflow="hidden" background-color="yellow" id="box1a"/>
+ </fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/box1.png"
+ inline-progression-dimension="2in"
+ block-progression-dimension="1in"
+ content-width="scale-down-to-fit"
+ content-height="scale-down-to-fit"
+ text-align="center" display-align="center"
+ overflow="hidden" background-color="yellow" id="box2"/>
+ <fo:external-graphic src="../../resources/images/box1.png"
+ inline-progression-dimension="1in"
+ block-progression-dimension="2in"
+ content-width="scale-down-to-fit"
+ content-height="scale-down-to-fit"
+ text-align="center" display-align="center"
+ overflow="hidden" background-color="yellow" id="box3"/>
+ </fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/box1.png"
+ inline-progression-dimension="0.5in"
+ block-progression-dimension="0.4in"
+ content-width="scale-up-to-fit"
+ content-height="scale-up-to-fit"
+ text-align="center" display-align="center"
+ overflow="hidden" background-color="yellow" id="box2a"/>
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- use intrinsic size -->
+ <eval expected="40009" xpath="//viewport[@prod-id='box-org']/@ipd"/>
+ <eval expected="40009" xpath="//viewport[@prod-id='box-org']/@bpd"/>
+ <eval expected="0 0 40009 40009" xpath="//viewport[@prod-id='box-org']/@pos"/>
+
+ <!-- bigger viewport (square) -->
+ <eval expected="72000" xpath="//viewport[@prod-id='box1']/@ipd"/>
+ <eval expected="72000" xpath="//viewport[@prod-id='box1']/@bpd"/>
+ <eval expected="15995 15995 40009 40009" xpath="//viewport[@prod-id='box1']/@pos"/>
+
+ <!-- smaller viewport (square) -->
+ <eval expected="36000" xpath="//viewport[@prod-id='box1a']/@ipd"/>
+ <eval expected="36000" xpath="//viewport[@prod-id='box1a']/@bpd"/>
+ <eval expected="-2004 -2004 40009 40009" xpath="//viewport[@prod-id='box1a']/@pos"/>
+
+ <!-- bigger viewport (rectangular) -->
+ <eval expected="144000" xpath="//viewport[@prod-id='box2']/@ipd"/>
+ <eval expected="72000" xpath="//viewport[@prod-id='box2']/@bpd"/>
+ <eval expected="51995 15995 40009 40009" xpath="//viewport[@prod-id='box2']/@pos"/>
+
+ <!-- bigger viewport (rectangular case 2) -->
+ <eval expected="72000" xpath="//viewport[@prod-id='box3']/@ipd"/>
+ <eval expected="144000" xpath="//viewport[@prod-id='box3']/@bpd"/>
+ <eval expected="15995 51995 40009 40009" xpath="//viewport[@prod-id='box3']/@pos"/>
+
+ <!-- smaller viewport (rectangular case) -->
+ <eval expected="36000" xpath="//viewport[@prod-id='box2a']/@ipd"/>
+ <eval expected="28800" xpath="//viewport[@prod-id='box2a']/@bpd"/>
+ <eval expected="-2004 -5604 40009 40009" xpath="//viewport[@prod-id='box2a']/@pos"/>
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_size_2.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org