Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_png.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_png.xml?rev=611278&r1=611277&r2=611278&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_png.xml (original) +++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_png.xml Fri Jan 11 11:50:53 2008 @@ -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/trunk/test/layoutengine/standard-testcases/external-graphic_tiff.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_tiff.xml?rev=611278&r1=611277&r2=611278&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_tiff.xml (original) +++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_tiff.xml Fri Jan 11 11:50:53 2008 @@ -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/trunk/test/layoutengine/standard-testcases/fox_external-document_1.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_1.xml?rev=611278&r1=611277&r2=611278&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_1.xml (original) +++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_1.xml Fri Jan 11 11:50:53 2008 @@ -38,15 +38,15 @@ <eval expected="1" xpath="count(//pageViewport)"/> <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@formatted-nr"/> <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@nr"/> - <eval expected="0 0 191975 191975" xpath="/areaTree/pageSequence/pageViewport/@bounds"/> + <eval expected="0 0 191976 191976" xpath="/areaTree/pageSequence/pageViewport/@bounds"/> - <eval expected="191975" xpath="//regionViewport/@ipd"/> - <eval expected="191975" xpath="//regionViewport/@bpd"/> - <eval expected="191975" xpath="//lineArea/@ipd"/> - <eval expected="191975" xpath="//lineArea/@bpd"/> - <eval expected="191975" xpath="//viewport/@ipd"/> - <eval expected="191975" xpath="//viewport/@bpd"/> - <eval expected="0 0 191975 191975" xpath="//viewport/@pos"/> + <eval expected="191976" xpath="//regionViewport/@ipd"/> + <eval expected="191976" xpath="//regionViewport/@bpd"/> + <eval expected="191976" xpath="//lineArea/@ipd"/> + <eval expected="191976" xpath="//lineArea/@bpd"/> + <eval expected="191976" xpath="//viewport/@ipd"/> + <eval expected="191976" xpath="//viewport/@bpd"/> + <eval expected="0 0 191976 191976" xpath="//viewport/@pos"/> <eval expected="img" xpath="//viewport/@prod-id"/> <eval expected="img" xpath="//image/@prod-id"/> </checks> Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_2.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_2.xml?rev=611278&r1=611277&r2=611278&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_2.xml (original) +++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_2.xml Fri Jan 11 11:50:53 2008 @@ -63,19 +63,19 @@ <eval expected="0 0 360000 360000" xpath="//[EMAIL PROTECTED] = '2']/@bounds"/> <eval expected="0 0 360000 360000" xpath="//[EMAIL PROTECTED] = '3']/@bounds"/> <eval expected="0 0 360000 360000" xpath="//[EMAIL PROTECTED] = '5']/@bounds"/> - <eval expected="0 0 843913 597171" xpath="//[EMAIL PROTECTED] = '6']/@bounds"/> + <eval expected="0 0 843913 597172" xpath="//[EMAIL PROTECTED] = '6']/@bounds"/> - <eval expected="84012 84012 191975 191975" xpath="//[EMAIL PROTECTED] = 'img1']/@pos"/> + <eval expected="84012 84012 191976 191976" xpath="//[EMAIL PROTECTED] = 'img1']/@pos"/> <eval expected="0 0 360000 360000" xpath="//[EMAIL PROTECTED] = 'img2']/@pos"/> - <eval expected="0 0 191975 191975" xpath="//[EMAIL PROTECTED] = 'img3']/@pos"/> - <eval expected="0 0 597171 843913" xpath="//[EMAIL PROTECTED] = 'img4']/@pos"/> + <eval expected="0 0 191976 191976" xpath="//[EMAIL PROTECTED] = 'img3']/@pos"/> + <eval expected="0 0 597172 843913" xpath="//[EMAIL PROTECTED] = 'img4']/@pos"/> - <eval expected="0 0 843913 597171" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/@rect"/> + <eval expected="0 0 843913 597172" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/@rect"/> <eval expected="843913" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/@ipd"/> - <eval expected="597171" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/@bpd"/> - <eval expected="597171" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/regionBody/@ipd"/> + <eval expected="597172" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/@bpd"/> + <eval expected="597172" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/regionBody/@ipd"/> <eval expected="843913" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/regionBody/@bpd"/> - <eval expected="[0.0 -1.0 1.0 0.0 0.0 597171.0]" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/regionBody/@ctm"/> + <eval expected="[0.0 -1.0 1.0 0.0 0.0 597172.0]" xpath="//[EMAIL PROTECTED] = '6']/page/regionViewport/regionBody/@ctm"/> </checks> </testcase> Modified: xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_2.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_2.xml?rev=611278&r1=611277&r2=611278&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_2.xml (original) +++ xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/inline_vertical-align_2.xml Fri Jan 11 11:50:53 2008 @@ -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> Propchange: xmlgraphics/fop/trunk/test/resources/images/bgimg300dpi.bmp ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Fri Jan 11 11:50:53 2008 @@ -1 +1 @@ -application/octet-stream +image/bmp Propchange: xmlgraphics/fop/trunk/test/resources/images/bgimg72dpi.bmp ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Fri Jan 11 11:50:53 2008 @@ -1 +1 @@ -application/octet-stream +image/bmp --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
