summaryrefslogtreecommitdiffstats
path: root/src/removeoverlap
diff options
context:
space:
mode:
authorTim Dwyer <tgdwyer@gmail.com>2006-02-06 01:41:48 +0000
committertgdwyer <tgdwyer@users.sourceforge.net>2006-02-06 01:41:48 +0000
commit3138500a18153ac96856aa4dde1bd96bf15a5a5d (patch)
treed6fac462171c905c698881cd382f8cbda5624aaf /src/removeoverlap
parentWarn user when attempting to put flowtext on path. (diff)
downloadinkscape-3138500a18153ac96856aa4dde1bd96bf15a5a5d.tar.gz
inkscape-3138500a18153ac96856aa4dde1bd96bf15a5a5d.zip
Stupid bug in generate-constraints events comparison test fixed
(bzr r84)
Diffstat (limited to 'src/removeoverlap')
-rw-r--r--src/removeoverlap/generate-constraints.cpp2
-rwxr-xr-xsrc/removeoverlap/remove_rectangle_overlap.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/removeoverlap/generate-constraints.cpp b/src/removeoverlap/generate-constraints.cpp
index efa477449..a8bfe28e7 100644
--- 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 34cedf481..9f98d5811 100755
--- 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;