More VS fixes

Former-commit-id: 356effb816b9527ff9e89ee3b99074c468455b08
This commit is contained in:
Lynix
2015-06-13 19:42:07 +02:00
parent 009d860d6c
commit 251e21f006
35 changed files with 121 additions and 79 deletions

View File

@@ -644,7 +644,7 @@ unsigned int NzImage::GetHeight(nzUInt8 level) const
nzUInt8 NzImage::GetLevelCount() const
{
return m_sharedImage->levels.size();
return nzUInt8(m_sharedImage->levels.size());
}
nzUInt8 NzImage::GetMaxLevel() const
@@ -1087,7 +1087,7 @@ void NzImage::SetLevelCount(nzUInt8 levelCount)
EnsureOwnership();
nzUInt8 oldLevelCount = m_sharedImage->levels.size();
nzUInt8 oldLevelCount = nzUInt8(m_sharedImage->levels.size());
nzUInt8 maxLevelCount = std::max(levelCount, oldLevelCount);
m_sharedImage->levels.resize(levelCount);