diff options
| author | Tim Dwyer <tgdwyer@gmail.com> | 2006-01-25 02:01:23 +0000 |
|---|---|---|
| committer | tgdwyer <tgdwyer@users.sourceforge.net> | 2006-01-25 02:01:23 +0000 |
| commit | 72633129f56262333906dc667962fab7c5afc4c1 (patch) | |
| tree | 5aadfe47d19b4549bda01a8f788f48efcef2a9dd /src/removeoverlap/blocks.cpp | |
| parent | mnemonics for all widgets in the Doc Props dialog (diff) | |
| download | inkscape-72633129f56262333906dc667962fab7c5afc4c1.tar.gz inkscape-72633129f56262333906dc667962fab7c5afc4c1.zip | |
Change to the way timestamps are used. Should now be more efficient.
(bzr r27)
Diffstat (limited to 'src/removeoverlap/blocks.cpp')
| -rw-r--r-- | src/removeoverlap/blocks.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/removeoverlap/blocks.cpp b/src/removeoverlap/blocks.cpp index 45c479187..23df60516 100644 --- a/src/removeoverlap/blocks.cpp +++ b/src/removeoverlap/blocks.cpp @@ -96,9 +96,10 @@ void Blocks::mergeLeft(Block *r) { dist=-dist; std::swap(l, r); } + blockTimeCtr++; r->merge(l, c, dist); r->mergeIn(l); - r->timeStamp=++blockTimeCtr; + r->timeStamp=blockTimeCtr; removeBlock(l); c=r->findMinInConstraint(); } |