Author: jeremias
Date: Wed Dec 7 01:40:16 2005
New Revision: 354757
URL: http://svn.apache.org/viewcvs?rev=354757&view=rev
Log:
Bugzilla #37815:
Bugfix: The combination of content-width="scale-to-fit" and
content-height="100%" did not work as expected due to a datatype conversion bug.
Submitted by: Tom <tom.at.craddock.id.au>
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java?rev=354757&r1=354756&r2=354757&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
Wed Dec 7 01:40:16 2005
@@ -147,8 +147,8 @@
cwidth = 0;
cheight = 0;
} else {
- double rat1 = cwidth / fobj.getIntrinsicWidth();
- double rat2 = cheight / fobj.getIntrinsicHeight();
+ double rat1 = (double) cwidth / fobj.getIntrinsicWidth();
+ double rat2 = (double) cheight / fobj.getIntrinsicHeight();
if (rat1 < rat2) {
// reduce cheight
cheight = (int)(rat1 * fobj.getIntrinsicHeight());
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/status.xml?rev=354757&r1=354756&r2=354757&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Wed Dec 7 01:40:16 2005
@@ -27,6 +27,10 @@
<changes>
<release version="FOP Trunk">
+ <action context="Code" dev="JM" type="fix" fixes-bug="37815" due-to="Tom
Craddock">
+ Bugfix: The combination of content-width="scale-to-fit" and
content-height="100%"
+ did not work as expected due to a datatype conversion bug.
+ </action>
<action context="Code" dev="JM" type="fix" fixes-bug="37813">
Bugfix: A span="all" on the first block cause a subsequent page break
and the first block
didn't span all columns.
Added:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml?rev=354757&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
(added)
+++
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
Wed Dec 7 01:40:16 2005
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 The Apache Software Foundation
+
+ Licensed 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 concerning Bugzilla #37815.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:svg="http://www.w3.org/2000/svg";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in"
page-height="5in" margin="20pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"
width="50%" content-width="scale-to-fit" content-height="100%" border="solid
1pt" background-color="yellow"/>EOG
+ </fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"
width="50%" content-width="scale-to-fit" content-height="100%" border="solid
1pt" background-color="yellow"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="320000" xpath="//flow/block[1]/@ipd"/>
+ <eval expected="160000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
+ <eval expected="162000" xpath="//flow/block[1]/lineArea/viewport/@ipda"/>
+ <eval expected="160000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
+ <eval expected="162000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
+ <eval expected="160000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="162000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="48080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
