pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Fixed crash with follow and rotate event.

Browse source
This commit is contained in:
Daria Volvenkova 2018-02-01 18:46:25 +03:00 • committed by Roman Kuznetsov
parent 907a882006
commit 064097a45b
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drape_frontend/frontend_renderer.cpp
View file

@ -2046,8 +2046,7 @@ void FrontendRenderer::ChangeModelView(m2::PointD const & userPos, double azimut
void FrontendRenderer::ChangeModelView(double autoScale, m2::PointD const & userPos, double azimuth,
m2::PointD const & pxZero, TAnimationCreator const & parallelAnimCreator)
{
AddUserEvent(make_unique_dp<FollowAndRotateEvent>(userPos, pxZero, azimuth, autoScale,
nullptr, parallelAnimCreator));
AddUserEvent(make_unique_dp<FollowAndRotateEvent>(userPos, pxZero, azimuth, autoScale, parallelAnimCreator));
}
ScreenBase const & FrontendRenderer::ProcessEvents(bool & modelViewChanged, bool & viewportChanged)

6
drape_frontend/user_event_stream.hpp
View file

@ -217,7 +217,7 @@ class FollowAndRotateEvent : public UserEvent
public:
FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero,
double azimuth, double autoScale,
TAnimationCreator const & parallelAnimCreator = nullptr)
TAnimationCreator const & parallelAnimCreator)
: m_userPos(userPos)
, m_pixelZero(pixelZero)
, m_azimuth(azimuth)
@ -232,8 +232,8 @@ public:
FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero,
double azimuth, int preferredZoomLevel,
bool isAnim, Animation::TAction const & onFinishAction = nullptr,
TAnimationCreator const & parallelAnimCreator = nullptr)
bool isAnim, Animation::TAction const & onFinishAction,
TAnimationCreator const & parallelAnimCreator)
: m_userPos(userPos)
, m_pixelZero(pixelZero)
, m_azimuth(azimuth)