diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-06-20 19:33:57 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-06-20 19:33:57 +0000 |
| commit | a39e3c37a508f9a389fc55270ae0336ad2f76f0e (patch) | |
| tree | 952db81c3238005e975f21845734444bba28ff40 /src/sp-mask.cpp | |
| parent | Measure Tool: support measuring of text elements (without having to manually ... (diff) | |
| parent | Fix outline view (diff) | |
| download | inkscape-a39e3c37a508f9a389fc55270ae0336ad2f76f0e.tar.gz inkscape-a39e3c37a508f9a389fc55270ae0336ad2f76f0e.zip | |
Merge Cairo rendering branch
(bzr r10326)
Diffstat (limited to 'src/sp-mask.cpp')
| -rw-r--r-- | src/sp-mask.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp index 513e52911..76efb6b4b 100644 --- a/src/sp-mask.cpp +++ b/src/sp-mask.cpp @@ -16,7 +16,6 @@ #include "display/nr-arena.h" #include "display/nr-arena-group.h" -#include "libnr/nr-matrix-ops.h" #include <xml/repr.h> #include "enums.h" @@ -353,10 +352,10 @@ sp_mask_set_bbox (SPMask *mask, unsigned int key, NRRect *bbox) { for (SPMaskView *v = mask->display; v != NULL; v = v->next) { if (v->key == key) { - if (!NR_DF_TEST_CLOSE (v->bbox.x0, bbox->x0, NR_EPSILON) || - !NR_DF_TEST_CLOSE (v->bbox.y0, bbox->y0, NR_EPSILON) || - !NR_DF_TEST_CLOSE (v->bbox.x1, bbox->x1, NR_EPSILON) || - !NR_DF_TEST_CLOSE (v->bbox.y1, bbox->y1, NR_EPSILON)) { + if (!Geom::are_near(v->bbox.x0, bbox->x0) || + !Geom::are_near(v->bbox.y0, bbox->y0) || + !Geom::are_near(v->bbox.x1, bbox->x1) || + !Geom::are_near(v->bbox.y1, bbox->y1)) { v->bbox = *bbox; } break; |