Merge branch 'master' into gui

Former-commit-id: a39dbeecbe470bf070375d55feb4a8a6154ce455 [formerly bbd2cced77138d6cf898887cc643869c5d47abde] [formerly 09e150b969ecfa7976eb8fb6ec085df1b8516d72 [formerly 25cd192c9f9caa4c1d3459b3a6e6bb3caabf6e19]]
Former-commit-id: f07555922035b7891f06c2a9034908e344a95ece [formerly cd7e94cdfb0438d1964f574f39870ed7746d693d]
Former-commit-id: 5f9a16d88ccddfc9ce15561d9a3e231cc076ffdc
This commit is contained in:
Lynix 2016-09-13 19:52:36 +02:00
commit a061a62de6
1 changed files with 2 additions and 2 deletions

View File

@ -89,7 +89,7 @@ namespace Nz
*/
inline const Color& Sprite::GetCornerColor(RectCorner corner) const
{
NazaraAssert(corner < m_cornerColor.size(), "Invalid corner");
NazaraAssert(static_cast<std::size_t>(corner) < m_cornerColor.size(), "Invalid corner");
return m_cornerColor[corner];
}
@ -164,7 +164,7 @@ namespace Nz
*/
inline void Sprite::SetCornerColor(RectCorner corner, const Color& color)
{
NazaraAssert(corner < m_cornerColor.size(), "Invalid corner");
NazaraAssert(static_cast<std::size_t>(corner) < m_cornerColor.size(), "Invalid corner");
m_cornerColor[corner] = color;