Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/drape
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2015-05-22 15:28:20 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:49:17 +0300
commitc93ecfd1b1e4e2c62d6f6148b4854081a06b98e5 (patch)
treeef876f3df9e0163ca8a63f064f542f2e0d7c60b1 /drape
parentf510a3bb6792341cf42ab7048c5b32124ae829cb (diff)
Rename AlmostEqual into AlmostEqualULPs.
Diffstat (limited to 'drape')
-rw-r--r--drape/drape_tests/stipple_pen_tests.cpp8
-rw-r--r--drape/drape_tests/texture_of_colors_tests.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/drape/drape_tests/stipple_pen_tests.cpp b/drape/drape_tests/stipple_pen_tests.cpp
index a336c587dc..ac8b2d4d55 100644
--- a/drape/drape_tests/stipple_pen_tests.cpp
+++ b/drape/drape_tests/stipple_pen_tests.cpp
@@ -30,10 +30,10 @@ namespace
bool IsRectsEqual(m2::RectF const & r1, m2::RectF const & r2)
{
- return my::AlmostEqual(r1.minX(), r2.minX()) &&
- my::AlmostEqual(r1.minY(), r2.minY()) &&
- my::AlmostEqual(r1.maxX(), r2.maxX()) &&
- my::AlmostEqual(r1.maxY(), r2.maxY());
+ return my::AlmostEqualULPs(r1.minX(), r2.minX()) &&
+ my::AlmostEqualULPs(r1.minY(), r2.minY()) &&
+ my::AlmostEqualULPs(r1.maxX(), r2.maxX()) &&
+ my::AlmostEqualULPs(r1.maxY(), r2.maxY());
}
}
diff --git a/drape/drape_tests/texture_of_colors_tests.cpp b/drape/drape_tests/texture_of_colors_tests.cpp
index 7be8585a07..e784378f02 100644
--- a/drape/drape_tests/texture_of_colors_tests.cpp
+++ b/drape/drape_tests/texture_of_colors_tests.cpp
@@ -24,10 +24,10 @@ namespace
void TestRects(m2::RectF const & a, m2::RectF const & b)
{
- TEST_ALMOST_EQUAL(a.minX(), b.minX(), ());
- TEST_ALMOST_EQUAL(a.maxX(), b.maxX(), ());
- TEST_ALMOST_EQUAL(a.minY(), b.minY(), ());
- TEST_ALMOST_EQUAL(a.maxY(), b.maxY(), ());
+ TEST_ALMOST_EQUAL_ULPS(a.minX(), b.minX(), ());
+ TEST_ALMOST_EQUAL_ULPS(a.maxX(), b.maxX(), ());
+ TEST_ALMOST_EQUAL_ULPS(a.minY(), b.minY(), ());
+ TEST_ALMOST_EQUAL_ULPS(a.maxY(), b.maxY(), ());
}
void InitOpenGLTextures(int const w, int const h)