Stupid bug in generate-constraints events comparison test fixed

diff --git a/src/removeoverlap/generate-constraints.cpp b/src/removeoverlap/generate-constraints.cpp
index efa4774499310d40ed752c09542611e7c021e661..a8bfe28e7eaa20ef6ce8b462a9587bdf91aa7067 100644 (file)
--- a/src/removeoverlap/generate-constraints.cpp
+++ b/src/removeoverlap/generate-constraints.cpp
@@ -140,7 +140,7 @@ Event **events;
 int compare_events(const void *a, const void *b) {
        Event *ea=*(Event**)a;
        Event *eb=*(Event**)b;
-       if(ea->v->r==ea->v->r) {
+       if(ea->v->r==eb->v->r) {
                // when comparing opening and closing from the same rect
                // open must come first
                if(ea->type==Open) return -1;

diff --git a/src/removeoverlap/remove_rectangle_overlap.cpp b/src/removeoverlap/remove_rectangle_overlap.cpp
index 34cedf48163ad2849fde0c4442e40dd510cd8934..9f98d5811cf98c63edf41eac0aee00fcf1ebf8c5 100755 (executable)
--- a/src/removeoverlap/remove_rectangle_overlap.cpp
+++ b/src/removeoverlap/remove_rectangle_overlap.cpp
@@ -6,7 +6,7 @@
 #include "constraint.h"
 #ifdef RECTANGLE_OVERLAP_LOGGING
 #include <fstream>
-#include <blocks.h>
+#include "blocks.h"
 using std::ios;
 using std::ofstream;
 using std::endl;