From: tgdwyer <tgdwyer@users.sourceforge.net>
Date: Wed, 25 Jan 2006 02:01:23 +0000 (+0000)
Subject: Change to the way timestamps are used.  Should now be more efficient.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bf2a32646f6fb37af760000f00ec04c586d61bfa;p=inkscape.git

Change to the way timestamps are used.  Should now be more efficient.
---

diff --git a/src/removeoverlap/block.cpp b/src/removeoverlap/block.cpp
index 799fa5d8e..32b310153 100644
--- a/src/removeoverlap/block.cpp
+++ b/src/removeoverlap/block.cpp
@@ -129,14 +129,12 @@ Constraint *Block::findMinInConstraint() {
 #ifdef RECTANGLE_OVERLAP_LOGGING
 			f<<" ... skipping internal constraint"<<endl;
 #endif
-		} else if(lb->timeStamp > rb->timeStamp 
-			&& v->timeStamp < lb->timeStamp 
-			|| v->timeStamp < rb->timeStamp) {
+		} else if(v->timeStamp < lb->timeStamp) {
 			// block at other end of constraint has been moved since this
 			in->deleteMin();
 			outOfDate.push_back(v);
 #ifdef RECTANGLE_OVERLAP_LOGGING
-			f<<"    reinserting out of date constraint"<<endl;
+			f<<"    reinserting out of date (reinsert later)"<<endl;
 #endif
 		} else {
 			break;
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();
 	}