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 lb...@apache.org on 2013/10/14 01:31:47 UTC
svn commit: r1531769 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
test/layoutengine/standard-testcases/fox_external-document_2.xml
Author: lbernardo
Date: Sun Oct 13 23:31:46 2013
New Revision: 1531769
URL: http://svn.apache.org/r1531769
Log:
FOP-1872: External document is clipped when rotated; patch submitted by Thanasis Giannimaras.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/fox_external-document_2.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java?rev=1531769&r1=1531768&r2=1531769&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/ExternalDocumentLayoutManager.java Sun Oct 13 23:31:46 2013
@@ -242,8 +242,14 @@ public class ExternalDocumentLayoutManag
pv.setPage(pageArea);
RegionViewport rv = new RegionViewport(referenceRect);
- rv.setIPD(referenceRect.width);
- rv.setBPD(referenceRect.height);
+
+ if (pageSeq.getReferenceOrientation() % 180 == 0) {
+ rv.setIPD(referenceRect.width);
+ rv.setBPD(referenceRect.height);
+ } else {
+ rv.setIPD(referenceRect.height);
+ rv.setBPD(referenceRect.width);
+ }
rv.setClip(true);
BodyRegion body = new BodyRegion(Constants.FO_REGION_BODY,
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=1531769&r1=1531768&r2=1531769&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 Sun Oct 13 23:31:46 2013
@@ -71,8 +71,8 @@
<eval expected="0 0 597172 843913" xpath="//viewport[@prod-id = 'img4']/@pos"/>
<eval expected="0 0 843913 597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@rect"/>
- <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/@ipd"/>
- <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@bpd"/>
+ <eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/@ipd"/>
+ <eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/@bpd"/>
<eval expected="597172" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ipd"/>
<eval expected="843913" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@bpd"/>
<eval expected="[0.0 -1.0 1.0 0.0 0.0 597172.0]" xpath="//pageViewport[@nr = '6']/page/regionViewport/regionBody/@ctm"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org