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
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2018-07-24 19:31:29 +0300
committerVlad Mihaylenko <vxmihaylenko@gmail.com>2018-07-25 18:49:59 +0300
commit7a1c013f934e89411b304b81686541d4c95fcb51 (patch)
treeeaf900ffdbbc2f78fe4930224a2b072617818f65 /drape_frontend
parent4632c8a8b5f07818297f1962a14c696f5366381a (diff)
Review fixes.
Diffstat (limited to 'drape_frontend')
-rw-r--r--drape_frontend/my_position_controller.cpp2
-rw-r--r--drape_frontend/navigator.cpp2
-rw-r--r--drape_frontend/visual_params.hpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/drape_frontend/my_position_controller.cpp b/drape_frontend/my_position_controller.cpp
index 7c73d47a72..63d37c7e0a 100644
--- a/drape_frontend/my_position_controller.cpp
+++ b/drape_frontend/my_position_controller.cpp
@@ -68,7 +68,7 @@ int GetZoomLevel(ScreenBase const & screen, m2::PointD const & position, double
{
ScreenBase s = screen;
m2::PointD const size(errorRadius, errorRadius);
- s.SetFromRect(m2::AnyRectD(position, screen.GetAngle(), m2::RectD(position - size, position + size)));
+ s.SetFromRect(m2::AnyRectD(position, ang::Angle<double>(screen.GetAngle()), m2::RectD(position - size, position + size)));
return GetZoomLevel(s);
}
diff --git a/drape_frontend/navigator.cpp b/drape_frontend/navigator.cpp
index 8f8d0aba04..841c81a276 100644
--- a/drape_frontend/navigator.cpp
+++ b/drape_frontend/navigator.cpp
@@ -311,7 +311,7 @@ m2::AnyRectD ToRotated(Navigator const & navigator, m2::RectD const & rect)
double const dy = rect.SizeY();
return m2::AnyRectD(rect.Center(),
- navigator.Screen().GetAngle(),
+ ang::Angle<double>(navigator.Screen().GetAngle()),
m2::RectD(-dx/2, -dy/2, dx/2, dy/2));
}
diff --git a/drape_frontend/visual_params.hpp b/drape_frontend/visual_params.hpp
index f4739f1a5a..f7fb4d60c2 100644
--- a/drape_frontend/visual_params.hpp
+++ b/drape_frontend/visual_params.hpp
@@ -5,8 +5,8 @@
#include "std/atomic.hpp"
#include "std/cstdint.hpp"
-#include "std/string.hpp"
#include "std/noncopyable.hpp"
+#include "std/string.hpp"
namespace df
{