diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2011-01-24 22:18:42 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2011-01-24 22:18:42 +0000 |
| commit | 1c8f05b0a02f3238ec6d508ed6e942b6104d7f1c (patch) | |
| tree | da2e5f8df4e56a94716d7cbd86eb1e5cf4de5c72 | |
| parent | 6de2d9fab226f7da81f5c803100990f71f7e44e1 (diff) | |
| download | xmlgraphics-fop-1c8f05b0a02f3238ec6d508ed6e942b6104d7f1c.tar.gz xmlgraphics-fop-1c8f05b0a02f3238ec6d508ed6e942b6104d7f1c.zip | |
Bugzilla 50635: fix issue in checkPreparedPages() where the same page-sequence is potentially started multiple times
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1063022 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/area/RenderPagesModel.java | 7 | ||||
| -rw-r--r-- | status.xml | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/area/RenderPagesModel.java b/src/java/org/apache/fop/area/RenderPagesModel.java index 592e49f1e..afec850f8 100644 --- a/src/java/org/apache/fop/area/RenderPagesModel.java +++ b/src/java/org/apache/fop/area/RenderPagesModel.java @@ -155,14 +155,15 @@ public class RenderPagesModel extends AreaTreeModel { * false if the renderer doesn't support out of order * rendering and there are pending pages */ - protected boolean checkPreparedPages(PageViewport newPageViewport, boolean - renderUnresolved) { + protected boolean checkPreparedPages(PageViewport newPageViewport, + boolean renderUnresolved) { + for (Iterator iter = prepared.iterator(); iter.hasNext();) { PageViewport pageViewport = (PageViewport)iter.next(); if (pageViewport.isResolved() || renderUnresolved) { if (!renderer.supportsOutOfOrder() && pageViewport.getPageSequence().isFirstPage(pageViewport)) { - renderer.startPageSequence(getCurrentPageSequence()); + renderer.startPageSequence(pageViewport.getPageSequence()); } renderPage(pageViewport); pageViewport.clear(); diff --git a/status.xml b/status.xml index bb51ab16f..dd131de73 100644 --- a/status.xml +++ b/status.xml @@ -59,6 +59,10 @@ documents. Example: the fix of marks layering will be such a case when it's done. --> <release version="FOP Trunk" date="TBD"> + <action context="Code" dev="AD" type="fix" fixes-bug="50635" due-to="mkoegler.AT.auto.tuwien.ac.at"> + Bugfix: fix issue in RenderPagesModel.checkPreparedPages() where the same page-sequence + is potentially started multiple times. + </action> <action context="Code" dev="AD" type="fix" fixes-bug="50636" due-to="mkoegler.AT.auto.tuwien.ac.at"> Bugfix: fix performance issue when adding pages, if the total number of pages is significantly large. |