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

Fixed crash on assert and warnings.

Browse source 
Conflicts:
	drape_frontend/navigator.cpp
This commit is contained in:
Daria Volvenkova 2015-11-20 14:50:19 +03:00
parent 227b48c667
commit 9ba43c7bc5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape_frontend/navigator.cpp
View file

@ -444,7 +444,6 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
newPt1 + offset, newPt2 + offset,
doRotateScreen);
ScreenBase tmp = screen;
tmp.SetGtoPMatrix(newM);

3
drape_frontend/user_event_stream.cpp
View file

@ -201,7 +201,8 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
}
break;
case UserEvent::EVENT_DISABLE_PERSPECTIVE:
SetDisable3dModeAnimation();
if (m_navigator.Screen().isPerspective())
SetDisable3dModeAnimation();
break;
default:
ASSERT(false, ());

4
drape_frontend/user_event_stream.hpp
View file

@ -148,9 +148,9 @@ struct FollowAndRotateEvent
struct EnablePerspectiveEvent
{
EnablePerspectiveEvent(double rotationAngle, double angleFOV, bool isAnim)
: m_rotationAngle(rotationAngle)
: m_isAnim(isAnim)
, m_rotationAngle(rotationAngle)
, m_angleFOV(angleFOV)
, m_isAnim(isAnim)
{}
bool m_isAnim;