diff --git a/drape/uniform_values_storage.cpp b/drape/uniform_values_storage.cpp index bf6dc28c76..ea2cc49e65 100644 --- a/drape/uniform_values_storage.cpp +++ b/drape/uniform_values_storage.cpp @@ -80,7 +80,7 @@ void UniformValuesStorage::SetFloatValue(string const & name, float v1, float v2 m_uniforms.push_back(UniformValue(name, v1, v2, v3, v4)); } -void UniformValuesStorage::SetMatrix4x4Value(string const & name, float * matrixValue) +void UniformValuesStorage::SetMatrix4x4Value(string const & name, float const * matrixValue) { UniformValue * uniform = findByName(name); if (uniform) diff --git a/drape/uniform_values_storage.hpp b/drape/uniform_values_storage.hpp index cd91ab24d6..e3e5864182 100644 --- a/drape/uniform_values_storage.hpp +++ b/drape/uniform_values_storage.hpp @@ -22,7 +22,7 @@ public: void SetFloatValue(string const & name, float v1, float v2, float v3); void SetFloatValue(string const & name, float v1, float v2, float v3, float v4); - void SetMatrix4x4Value(string const & name, float * matrixValue); + void SetMatrix4x4Value(string const & name, float const * matrixValue); typedef function enum_uniforms_fn; void ForeachValue(enum_uniforms_fn action) const; diff --git a/drape_gui/skin.cpp b/drape_gui/skin.cpp index b7f1fad40c..4792bc8d70 100644 --- a/drape_gui/skin.cpp +++ b/drape_gui/skin.cpp @@ -258,7 +258,7 @@ Skin::Skin(ReaderPtr const & reader) Position Skin::ResolvePosition(ElementName name) { // check that name have only one bit - ASSERT((static_cast(name) & (static_cast(name) - 1)) == 0,()); + ASSERT((static_cast(name) & (static_cast(name) - 1)) == 0, ()); TResolversPair const & resolvers = m_resolvers[name]; PositionResolver const & resolver = (m_displayWidth < m_displayHeight) ? resolvers.first : resolvers.second; return resolver.Resolve(m_displayWidth, m_displayHeight, DrapeGui::Instance().GetScaleFactor());