diff options
| author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-02-12 17:29:00 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:37:25 +0300 |
| commit | 714a7e1a371f440da30898d8b9db4a9187b63cfa (patch) | |
| tree | 5daf8246720f9ba96223b5e265d72441b4b34c72 /geometry | |
| parent | 04b7fc51e669a6244ce72d90a0231f353b70a993 (diff) | |
Cross context reading fixes + PR updates
Diffstat (limited to 'geometry')
| -rw-r--r-- | geometry/geometry_tests/region_test.cpp | 10 | ||||
| -rw-r--r-- | geometry/region2d.hpp | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/geometry/geometry_tests/region_test.cpp b/geometry/geometry_tests/region_test.cpp index 944dc60903..64cc0fb208 100644 --- a/geometry/geometry_tests/region_test.cpp +++ b/geometry/geometry_tests/region_test.cpp @@ -206,9 +206,9 @@ UNIT_TEST(Region_point_at_border_test) P p4(5.0, 1.0); P p5(5.0, 1.01); - TEST(!region.atBorder(p1, 0.01), ("Point lies outside the border")); - TEST(!region.atBorder(p2, 0.01), ("Point lies strictly inside the border")); - TEST(region.atBorder(p3, 0.01), ("Point has same point with border")); - TEST(region.atBorder(p4, 0.01), ("Point lies at border")); - TEST(region.atBorder(p5, 0.01), ("Point lies at delta interval near border")); + TEST(!region.AtBorder(p1, 0.01), ("Point lies outside the border")); + TEST(!region.AtBorder(p2, 0.01), ("Point lies strictly inside the border")); + TEST(region.AtBorder(p3, 0.01), ("Point has same point with the border")); + TEST(region.AtBorder(p4, 0.01), ("Point lies at the border")); + TEST(region.AtBorder(p5, 0.01), ("Point lies at delta interval near the border")); } diff --git a/geometry/region2d.hpp b/geometry/region2d.hpp index 5a41222f66..622192178b 100644 --- a/geometry/region2d.hpp +++ b/geometry/region2d.hpp @@ -195,7 +195,7 @@ namespace m2 /// Slow check that point lies at the border. template <class EqualF> - bool atBorder(PointT const & pt, double const delta, EqualF equalF) const + bool AtBorder(PointT const & pt, double const delta, EqualF equalF) const { if (!m_rect.IsPointInside(pt)) return false; @@ -227,9 +227,9 @@ namespace m2 return false; // Point lies outside the border. } - bool atBorder(PointT const & pt, double const delta) const + bool AtBorder(PointT const & pt, double const delta) const { - return atBorder(pt, delta, typename TraitsT::EqualType()); + return AtBorder(pt, delta, typename TraitsT::EqualType()); } private: |