diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2014-03-20 22:59:13 +0000 |
|---|---|---|
| committer | Johan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl> | 2014-03-20 22:59:13 +0000 |
| commit | dcd9fafa57174f7e2b8102adcf1c5701c43cffa9 (patch) | |
| tree | 2586e3bdf6c103e994a2878a527a0aad6becb340 /src | |
| parent | remove #pragma for 11 year old compiler that I cannot imagine anyone using at... (diff) | |
| download | inkscape-dcd9fafa57174f7e2b8102adcf1c5701c43cffa9.tar.gz inkscape-dcd9fafa57174f7e2b8102adcf1c5701c43cffa9.zip | |
apply 2geom rev. 2169 (bug fix)
(bzr r13175)
Diffstat (limited to 'src')
| -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) { |