diff options
| author | Ted Gould <ted@gould.cx> | 2006-02-06 05:38:08 +0000 |
|---|---|---|
| committer | gouldtj <gouldtj@users.sourceforge.net> | 2006-02-06 05:38:08 +0000 |
| commit | 1d97567299259f4ceaea8ff51de359dc74b49578 (patch) | |
| tree | 5d4da9bec137ed8edc1e1e25faa068645a3c67a5 /src/removeoverlap | |
| parent | DBL_MIN replaced by -DBL_MAX which is what I meant all along. (diff) | |
| download | inkscape-1d97567299259f4ceaea8ff51de359dc74b49578.tar.gz inkscape-1d97567299259f4ceaea8ff51de359dc74b49578.zip | |
(bzr r90)
Diffstat (limited to 'src/removeoverlap')
| -rw-r--r-- | src/removeoverlap/constraint.h | 4 | ||||
| -rw-r--r-- | src/removeoverlap/generate-constraints.cpp | 2 | ||||
| -rwxr-xr-x | src/removeoverlap/remove_rectangle_overlap.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/removeoverlap/constraint.h b/src/removeoverlap/constraint.h index c8273376b..683d66da3 100644 --- a/src/removeoverlap/constraint.h +++ b/src/removeoverlap/constraint.h @@ -37,11 +37,11 @@ static inline bool compareConstraints(Constraint *const &l, Constraint *const &r double const sl = l->left->block->timeStamp > l->timeStamp ||l->left->block==l->right->block - ?-DBL_MAX:l->slack(); + ?DBL_MIN:l->slack(); double const sr = r->left->block->timeStamp > r->timeStamp ||r->left->block==r->right->block - ?-DBL_MAX:r->slack(); + ?DBL_MIN:r->slack(); if(sl==sr) { // arbitrary choice based on id if(l->left->id==r->left->id) { diff --git a/src/removeoverlap/generate-constraints.cpp b/src/removeoverlap/generate-constraints.cpp index a8bfe28e7..efa477449 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==eb->v->r) { + if(ea->v->r==ea->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 9f98d5811..34cedf481 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; |