map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[drape] minor changes

Browse source
This commit is contained in:
ExMix 2015-03-24 14:10:46 +03:00 • committed by r.kuznetsov
parent 29a79cd8a6
commit f81a08d2d7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape/uniform_values_storage.cpp
View file

@ -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)

2
drape/uniform_values_storage.hpp
View file

@ -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<void (UniformValue const & )> enum_uniforms_fn;
void ForeachValue(enum_uniforms_fn action) const;

2
drape_gui/skin.cpp
View file

@ -258,7 +258,7 @@ Skin::Skin(ReaderPtr<Reader> const & reader)
Position Skin::ResolvePosition(ElementName name)
{
// check that name have only one bit
ASSERT((static_cast<int>(name) & (static_cast<int>(name) - 1)) == 0,());
ASSERT((static_cast<int>(name) & (static_cast<int>(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());