Merge from trunk

(bzr r10347.1.5)

2 files changed, 30 insertions, 30 deletions

diff --git a/src/libvpsc/CMakeLists.txt b/src/libvpsc/CMakeLists.txt
index 8db059b5d..4099900b5 100644
--- a/src/libvpsc/CMakeLists.txt
+++ b/src/libvpsc/CMakeLists.txt
@@ -1,29 +1,29 @@
-

-set(libvpsc_SRC

-	block.cpp

-	blocks.cpp

-	constraint.cpp

-	csolve_VPSC.cpp

-	generate-constraints.cpp

-	remove_rectangle_overlap.cpp

-	solve_VPSC.cpp

-	variable.cpp

-	pairingheap/PairingHeap.cpp

-

-

-	# -------

-	# Headers

-	block.h

-	blocks.h

-	constraint.h

-	csolve_VPSC.h

-	generate-constraints.h

-	pairingheap/PairingHeap.h

-	pairingheap/dsexceptions.h

-	placement_SolveVPSC.h

-	remove_rectangle_overlap.h

-	solve_VPSC.h

-	variable.h

-)

-

-add_inkscape_lib(vpsc_LIB "${libvpsc_SRC}")

+
+set(libvpsc_SRC
+	block.cpp
+	blocks.cpp
+	constraint.cpp
+	csolve_VPSC.cpp
+	generate-constraints.cpp
+	remove_rectangle_overlap.cpp
+	solve_VPSC.cpp
+	variable.cpp
+	pairingheap/PairingHeap.cpp
+
+
+	# -------
+	# Headers
+	block.h
+	blocks.h
+	constraint.h
+	csolve_VPSC.h
+	generate-constraints.h
+	pairingheap/PairingHeap.h
+	pairingheap/dsexceptions.h
+	placement_SolveVPSC.h
+	remove_rectangle_overlap.h
+	solve_VPSC.h
+	variable.h
+)
+
+add_inkscape_lib(vpsc_LIB "${libvpsc_SRC}")
diff --git a/src/libvpsc/block.cpp b/src/libvpsc/block.cpp
index 221df536a..0bd662f28 100644
--- a/src/libvpsc/block.cpp
+++ b/src/libvpsc/block.cpp
@@ -72,7 +72,7 @@ void Block::setUpConstraintHeap(PairingHeap<Constraint*>* &h,bool in) {
 		for (Cit j=cs->begin();j!=cs->end();++j) {
 			Constraint *c=*j;
 			c->timeStamp=blockTimeCtr;
-			if (c->left->block != this && in || c->right->block != this && !in) {
+			if ((c->left->block != this && in) || (c->right->block != this && !in)) {
 				h->insert(c);
 			}
 		}