Browse Source

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
tags/fop-1_1rc1old
Andreas L. Delmelle 13 years ago
parent
commit
1c8f05b0a0
2 changed files with 8 additions and 3 deletions
  1. 4
    3
      src/java/org/apache/fop/area/RenderPagesModel.java
  2. 4
    0
      status.xml

+ 4
- 3
src/java/org/apache/fop/area/RenderPagesModel.java View File

* false if the renderer doesn't support out of order * false if the renderer doesn't support out of order
* rendering and there are pending pages * 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();) { for (Iterator iter = prepared.iterator(); iter.hasNext();) {
PageViewport pageViewport = (PageViewport)iter.next(); PageViewport pageViewport = (PageViewport)iter.next();
if (pageViewport.isResolved() || renderUnresolved) { if (pageViewport.isResolved() || renderUnresolved) {
if (!renderer.supportsOutOfOrder() if (!renderer.supportsOutOfOrder()
&& pageViewport.getPageSequence().isFirstPage(pageViewport)) { && pageViewport.getPageSequence().isFirstPage(pageViewport)) {
renderer.startPageSequence(getCurrentPageSequence());
renderer.startPageSequence(pageViewport.getPageSequence());
} }
renderPage(pageViewport); renderPage(pageViewport);
pageViewport.clear(); pageViewport.clear();

+ 4
- 0
status.xml View File

documents. Example: the fix of marks layering will be such a case when it's done. documents. Example: the fix of marks layering will be such a case when it's done.
--> -->
<release version="FOP Trunk" date="TBD"> <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"> <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 Bugfix: fix performance issue when adding pages, if the total number of pages
is significantly large. is significantly large.

Loading…
Cancel
Save