diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2015-10-30 13:48:44 +0300 |
---|---|---|
committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2015-12-29 16:36:02 +0300 |
commit | 16f9adfa70b1dc5729839081c52dad0e0adcde81 (patch) | |
tree | 9e8d8f99b10c26773b142fa7a8e93e9a74cb74d0 /drape_frontend/navigator.cpp | |
parent | f2100e2427a8b97603b441432d66df0f40d5c795 (diff) |
POI selection fixed.
Conflicts:
drape_frontend/navigator.cpp
Diffstat (limited to 'drape_frontend/navigator.cpp')
-rw-r--r-- | drape_frontend/navigator.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drape_frontend/navigator.cpp b/drape_frontend/navigator.cpp index 4a60257301..17ddad62b6 100644 --- a/drape_frontend/navigator.cpp +++ b/drape_frontend/navigator.cpp @@ -374,7 +374,7 @@ namespace void Navigator::Scale(m2::PointD const & pt, double factor) { - CalculateScale(pt, factor, m_Screen); + CalculateScale(m_Screen.P3dToP(pt), factor, m_Screen); } void Navigator::CalculateScale(m2::PointD const & pt, double factor, ScreenBase & screen) @@ -417,9 +417,7 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2, ScreenBase & screen) { math::Matrix<double, 3, 3> const newM = - screen.GtoPMatrix() * ScreenBase::CalcTransform(screen.P3dToP(oldPt1), screen.P3dToP(oldPt2), - screen.P3dToP(newPt1), screen.P3dToP(newPt2), - doRotateScreen); + screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1, oldPt2, newPt1, newPt2, doRotateScreen); ScreenBase tmp = screen; tmp.SetGtoPMatrix(newM); |