diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-06-23 16:38:51 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-06-23 16:38:51 +0000 |
| commit | 1079b1b4c0331e5d4bd62f3c93349aec50f520f0 (patch) | |
| tree | 50b185ea8e291e6bdbbd36dddc76820e88f44309 /src/display | |
| parent | Remove the dom/work directory (diff) | |
| download | inkscape-1079b1b4c0331e5d4bd62f3c93349aec50f520f0.tar.gz inkscape-1079b1b4c0331e5d4bd62f3c93349aec50f520f0.zip | |
Update 2Geom to pull in integer rectangle class
(bzr r10347.1.1)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/nr-arena-image.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-filter-composite.cpp | 1 | ||||
| -rw-r--r-- | src/display/nr-filter-gaussian.cpp | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/display/nr-arena-image.cpp b/src/display/nr-arena-image.cpp index 36d733eb8..a943a6214 100644 --- a/src/display/nr-arena-image.cpp +++ b/src/display/nr-arena-image.cpp @@ -301,7 +301,7 @@ nr_arena_image_rect (NRArenaImage *image) Geom::Point p(image->ox, image->oy); Geom::Point wh(vw, vh); Geom::Rect view(p, p+wh); - Geom::OptRect res = Geom::intersect(r, view); + Geom::OptRect res = r & view; r = res ? *res : r; } diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp index d4cf47af4..694ccaec5 100644 --- a/src/display/nr-filter-composite.cpp +++ b/src/display/nr-filter-composite.cpp @@ -11,7 +11,6 @@ #include <cmath> -#include "2geom/isnan.h" #include "display/cairo-templates.h" #include "display/cairo-utils.h" #include "display/nr-filter-composite.h" diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp index 326c37160..884e832ef 100644 --- a/src/display/nr-filter-gaussian.cpp +++ b/src/display/nr-filter-gaussian.cpp @@ -25,8 +25,6 @@ #include <omp.h> #endif //HAVE_OPENMP -#include "2geom/isnan.h" - #include "display/cairo-utils.h" #include "display/nr-filter-primitive.h" #include "display/nr-filter-gaussian.h" |