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 2007/12/11 16:16:22 UTC
svn commit: r603266 -
/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/
Author: jeremias
Date: Tue Dec 11 07:16:22 2007
New Revision: 603266
URL: http://svn.apache.org/viewvc?rev=603266&view=rev
Log:
Size calculation for images can be slightly different after the redesign due to different rounding. Give a little tolerance.
Modified:
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_bmp.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_emf.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_eps.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_png.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_tiff.xml
xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/inline_vertical-align_2.xml
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_bmp.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_bmp.xml?rev=603266&r1=603265&r2=603266&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_bmp.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_bmp.xml Tue Dec 11 07:16:22 2007
@@ -45,13 +45,13 @@
</fo:root>
</fo>
<checks>
- <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
- <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
- <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
- <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
- <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
- <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
- <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
- <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_emf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_emf.xml?rev=603266&r1=603265&r2=603266&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_emf.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_emf.xml Tue Dec 11 07:16:22 2007
@@ -41,9 +41,9 @@
</fo:root>
</fo>
<checks>
- <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
- <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
- <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
- <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_eps.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_eps.xml?rev=603266&r1=603265&r2=603266&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_eps.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_eps.xml Tue Dec 11 07:16:22 2007
@@ -41,9 +41,9 @@
</fo:root>
</fo>
<checks>
- <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
- <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
- <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
- <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_png.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_png.xml?rev=603266&r1=603265&r2=603266&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_png.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_png.xml Tue Dec 11 07:16:22 2007
@@ -45,14 +45,14 @@
</fo:root>
</fo>
<checks>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
<!-- Due to unit computations there is a little difference to the expected 192000 -->
- <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
- <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
- <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
- <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_tiff.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_tiff.xml?rev=603266&r1=603265&r2=603266&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_tiff.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/external-graphic_tiff.xml Tue Dec 11 07:16:22 2007
@@ -53,21 +53,21 @@
</fo:root>
</fo>
<checks>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
- <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
- <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
- <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
- <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
- <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
- <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
- <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
- <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
- <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
- <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
- <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
- <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
- <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+ <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+ <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+ <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+ <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+ <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+ <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+ <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
</checks>
</testcase>
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/inline_vertical-align_2.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/inline_vertical-align_2.xml?rev=603266&r1=603265&r2=603266&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/inline_vertical-align_2.xml (original)
+++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/layoutengine/standard-testcases/inline_vertical-align_2.xml Tue Dec 11 07:16:22 2007
@@ -71,52 +71,52 @@
</fo:root>
</fo>
<checks>
- <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[1]/@offset"/>
<eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[1]/@offset"/>
<eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[2]/@offset"/>
- <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[2]/@offset"/>
- <eval expected="35995" xpath="//flow/block[1]/lineArea[2]/viewport[3]/@offset"/>
- <eval expected="17998" xpath="//flow/block[1]/lineArea[2]/viewport[4]/@offset"/>
- <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[3]/@offset"/>
- <eval expected="34379" xpath="//flow/block[1]/lineArea[2]/viewport[5]/@offset"/>
- <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[4]/@offset"/>
+ <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="17998" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[3]/@offset"/>
+ <eval expected="34379" tolerance="5" xpath="//flow/block[1]/lineArea[2]/viewport[5]/@offset"/>
+ <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[4]/@offset"/>
<eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[6]/@offset"/>
- <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[5]/@offset"/>
+ <eval expected="48812" tolerance="5" xpath="//flow/block[1]/lineArea[2]/text[5]/@offset"/>
- <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[1]/@offset"/>
<eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[1]/@offset"/>
<eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[2]/@offset"/>
- <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[2]/@offset"/>
- <eval expected="35995" xpath="//flow/block[2]/lineArea[2]/viewport[3]/@offset"/>
- <eval expected="17998" xpath="//flow/block[2]/lineArea[2]/viewport[4]/@offset"/>
- <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[3]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" tolerance="5" xpath="//flow/block[2]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="17998" tolerance="5" xpath="//flow/block[2]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[3]/@offset"/>
<eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[5]/@offset"/>
- <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[4]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[2]/lineArea[2]/text[4]/@offset"/>
<eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[1]/@offset"/>
<eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[1]/@offset"/>
<eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[2]/@offset"/>
<eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[2]/@offset"/>
- <eval expected="35995" xpath="//flow/block[3]/lineArea[2]/viewport[3]/@offset"/>
- <eval expected="17998" xpath="//flow/block[3]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="35995" tolerance="5" xpath="//flow/block[3]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="17998" tolerance="5" xpath="//flow/block[3]/lineArea[2]/viewport[4]/@offset"/>
<eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[3]/@offset"/>
<eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[1]/@offset"/>
<eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[1]/@offset"/>
<eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[2]/@offset"/>
<eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[2]/@offset"/>
- <eval expected="35995" xpath="//flow/block[4]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="35995" tolerance="5" xpath="//flow/block[4]/lineArea[2]/viewport[3]/@offset"/>
<eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[4]/@offset"/>
<eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[3]/@offset"/>
- <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[1]/@offset"/>
<eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[1]/@offset"/>
<eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[2]/@offset"/>
- <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[2]/@offset"/>
- <eval expected="35995" xpath="//flow/block[5]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" tolerance="5" xpath="//flow/block[5]/lineArea[2]/viewport[3]/@offset"/>
<eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[4]/@offset"/>
- <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[3]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[3]/@offset"/>
<eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[5]/@offset"/>
- <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[4]/@offset"/>
+ <eval expected="14433" tolerance="5" xpath="//flow/block[5]/lineArea[2]/text[4]/@offset"/>
</checks>
</testcase>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org