spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing nonstandard types found by mingw-w64-i686

pull/110/head
Hleb Valoshka 2018-11-06 00:34:16 +03:00
parent 02e920d703
commit d7839beaf2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/celengine/texture.cpp
View File

@ -248,8 +248,8 @@ static void LoadMipmapSet(Image& img, GLenum target)
for (int mip = 0; mip < img.getMipLevelCount(); mip++)
{
unsigned int mipWidth = max((uint) img.getWidth() >> mip, 1u);
unsigned int mipHeight = max((uint) img.getHeight() >> mip, 1u);
unsigned int mipWidth = max((unsigned int) img.getWidth() >> mip, 1u);
unsigned int mipHeight = max((unsigned int) img.getHeight() >> mip, 1u);
if (img.isCompressed())
{
@ -510,7 +510,7 @@ TiledTexture::TiledTexture(Image& img,
vSplit(_vSplit),
glNames(nullptr)
{
glNames = new uint[uSplit * vSplit];
glNames = new unsigned int[uSplit * vSplit];
{
for (int i = 0; i < uSplit * vSplit; i++)
glNames[i] = 0;
@ -578,10 +578,10 @@ TiledTexture::TiledTexture(Image& img,
int blockSize = getCompressedBlockSize(img.getFormat());
unsigned char* imgMip =
img.getMipLevel(min(mip, mipLevelCount));
unsigned int mipWidth = max((uint) img.getWidth() >> mip, 1u);
unsigned int mipWidth = max((unsigned int) img.getWidth() >> mip, 1u);
unsigned char* tileMip = tile->getMipLevel(mip);
unsigned int tileMipWidth = max((uint) tile->getWidth() >> mip, 1u);
unsigned int tileMipHeight = max((uint) tile->getHeight() >> mip, 1u);
unsigned int tileMipWidth = max((unsigned int) tile->getWidth() >> mip, 1u);
unsigned int tileMipHeight = max((unsigned int) tile->getHeight() >> mip, 1u);
int uBlocks = max(tileMipWidth / 4, 1u);
int vBlocks = max(tileMipHeight / 4, 1u);
int destBytesPerRow = uBlocks * blockSize;

4
src/celengine/virtualtex.cpp
View File

@ -86,7 +86,7 @@ const TextureTile VirtualTexture::getTile(int lod, int u, int v)
lod += baseSplit;
if (lod < 0 || (uint) lod >= nResolutionLevels ||
if (lod < 0 || (unsigned int) lod >= nResolutionLevels ||
u < 0 || u >= (2 << lod) ||
v < 0 || v >= (1 << lod))
{
@ -277,7 +277,7 @@ void VirtualTexture::populateTileTree()
{
// Found a tile, so add it to the quadtree
Tile* tile = new Tile();
addTileToTree(tile, maxLevel, (uint) u, (uint) v);
addTileToTree(tile, maxLevel, (unsigned int) u, (unsigned int) v);
}
}
}