diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-17 19:41:49 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-17 19:41:49 +0000 |
| commit | 37c2baa5e61e755f0199bdd6926e68a7c2e90483 (patch) | |
| tree | c71b4a8e15c510656e2bd53ff7331870997b7de1 /src | |
| parent | Fix crash that occurred when scaling a clipped object, as reported in lp:811819 (diff) | |
| download | inkscape-37c2baa5e61e755f0199bdd6926e68a7c2e90483.tar.gz inkscape-37c2baa5e61e755f0199bdd6926e68a7c2e90483.zip | |
Fix build failures on make check
(bzr r10465)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnr/Makefile_insert | 4 | ||||
| -rw-r--r-- | src/libnr/in-svg-plane-test.h | 21 | ||||
| -rw-r--r-- | src/mod360-test.h | 4 |
3 files changed, 13 insertions, 16 deletions
diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert index 57d82c8ef..cdb0b482c 100644 --- a/src/libnr/Makefile_insert +++ b/src/libnr/Makefile_insert @@ -20,6 +20,4 @@ ink_common_sources += \ # ### CxxTest stuff #### # ###################### CXXTEST_TESTSUITES += \ - $(srcdir)/libnr/in-svg-plane-test.h \ - $(srcdir)/libnr/nr-point-fns-test.h \ - $(srcdir)/libnr/nr-types-test.h + $(srcdir)/libnr/in-svg-plane-test.h diff --git a/src/libnr/in-svg-plane-test.h b/src/libnr/in-svg-plane-test.h index e64f76251..696f82421 100644 --- a/src/libnr/in-svg-plane-test.h +++ b/src/libnr/in-svg-plane-test.h @@ -4,7 +4,8 @@ #include <cmath> #include "libnr/in-svg-plane.h" -#include "2geom/isnan.h" +#include <2geom/math-utils.h> +#include <2geom/point.h> class InSvgPlaneTest : public CxxTest::TestSuite { @@ -38,14 +39,14 @@ public: } bool setupValid; - NR::Point const p3n4; - NR::Point const p0; + Geom::Point const p3n4; + Geom::Point const p0; double const small; double const inf; double const nan; - NR::Point const small_left; - NR::Point const small_n3_4; - NR::Point const part_nan; + Geom::Point const small_left; + Geom::Point const small_n3_4; + Geom::Point const part_nan; void testInSvgPlane(void) @@ -55,13 +56,13 @@ public: TS_ASSERT( in_svg_plane(small_left) ); TS_ASSERT( in_svg_plane(small_n3_4) ); TS_ASSERT_DIFFERS( nan, nan ); - TS_ASSERT( !in_svg_plane(NR::Point(nan, 3.)) ); - TS_ASSERT( !in_svg_plane(NR::Point(inf, nan)) ); - TS_ASSERT( !in_svg_plane(NR::Point(0., -inf)) ); + TS_ASSERT( !in_svg_plane(Geom::Point(nan, 3.)) ); + TS_ASSERT( !in_svg_plane(Geom::Point(inf, nan)) ); + TS_ASSERT( !in_svg_plane(Geom::Point(0., -inf)) ); double const xs[] = {inf, -inf, nan, 1., -2., small, -small}; for (unsigned i = 0; i < G_N_ELEMENTS(xs); ++i) { for (unsigned j = 0; j < G_N_ELEMENTS(xs); ++j) { - TS_ASSERT_EQUALS( in_svg_plane(NR::Point(xs[i], xs[j])), + TS_ASSERT_EQUALS( in_svg_plane(Geom::Point(xs[i], xs[j])), (fabs(xs[i]) < inf && fabs(xs[j]) < inf ) ); } diff --git a/src/mod360-test.h b/src/mod360-test.h index 508553970..932361eb3 100644 --- a/src/mod360-test.h +++ b/src/mod360-test.h @@ -3,9 +3,7 @@ #define SEEN_MOD_360_TEST_H #include <cxxtest/TestSuite.h> - -#include "2geom/isnan.h" - +#include <2geom/math-utils.h> #include "mod360.h" |