diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-03-23 17:45:35 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-03-23 17:45:35 +0000 |
| commit | ec3232de2273e8d3e1efc0b89b30c770dd6a9a71 (patch) | |
| tree | e084165557d264e0d7641647af1bdd9f9765897b /src/2geom | |
| parent | Fixed bug continuing cusp nodes (diff) | |
| parent | fix Windows build for newer gcc/libs (diff) | |
| download | inkscape-ec3232de2273e8d3e1efc0b89b30c770dd6a9a71.tar.gz inkscape-ec3232de2273e8d3e1efc0b89b30c770dd6a9a71.zip | |
update to trunk
(bzr r11950.1.311)
Diffstat (limited to 'src/2geom')
| -rw-r--r-- | src/2geom/generic-interval.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/2geom/generic-interval.h b/src/2geom/generic-interval.h index 41eaf59b0..f6d4718de 100644 --- a/src/2geom/generic-interval.h +++ b/src/2geom/generic-interval.h @@ -274,10 +274,12 @@ public: /** @brief Union with another interval, gracefully handling empty ones. */ void unionWith(GenericOptInterval<C> const &a) { - if (*this) { // check that we are not empty - (*this)->unionWith(*a); - } else if (a) { - *this = *a; + if (a) { + if (*this) { // check that we are not empty + (*this)->unionWith(*a); + } else { + *this = *a; + } } } void intersectWith(GenericOptInterval<C> const &o) { |