diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-02-06 22:58:11 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-02-06 23:02:15 +1000 |
| commit | 0904884ad47b5df67a5a26360d3bb35de1e76e5c (patch) | |
| tree | 7d679c6e0b157c5181f1c7bc4c3d4c8aeb616cdb /src/cguittfont | |
| parent | 1367e8ffff9649af7b988bfcf82a3c0ae7c1c27b (diff) | |
| download | minetest-0904884ad47b5df67a5a26360d3bb35de1e76e5c.tar.gz minetest-0904884ad47b5df67a5a26360d3bb35de1e76e5c.tar.bz2 minetest-0904884ad47b5df67a5a26360d3bb35de1e76e5c.zip | |
Fix warnings in CGUITTFont.cpp
Diffstat (limited to 'src/cguittfont')
| -rw-r--r-- | src/cguittfont/CGUITTFont.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cguittfont/CGUITTFont.cpp b/src/cguittfont/CGUITTFont.cpp index 170b26648..f6606996e 100644 --- a/src/cguittfont/CGUITTFont.cpp +++ b/src/cguittfont/CGUITTFont.cpp @@ -87,10 +87,10 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide const u32 image_pitch = image->getPitch() / sizeof(u16); u16* image_data = (u16*)image->lock(); u8* glyph_data = bits.buffer; - for (u32 y = 0; y < bits.rows; ++y) + for (int y = 0; y < bits.rows; ++y) { u16* row = image_data; - for (u32 x = 0; x < bits.width; ++x) + for (int x = 0; x < bits.width; ++x) { // Monochrome bitmaps store 8 pixels per byte. The left-most pixel is the bit 0x80. // So, we go through the data each bit at a time. @@ -116,10 +116,10 @@ video::IImage* SGUITTGlyph::createGlyphImage(const FT_Bitmap& bits, video::IVide const u32 image_pitch = image->getPitch() / sizeof(u32); u32* image_data = (u32*)image->lock(); u8* glyph_data = bits.buffer; - for (u32 y = 0; y < bits.rows; ++y) + for (int y = 0; y < bits.rows; ++y) { u8* row = glyph_data; - for (u32 x = 0; x < bits.width; ++x) + for (int x = 0; x < bits.width; ++x) { image_data[y * image_pitch + x] |= static_cast<u32>(255.0f * (static_cast<float>(*row++) / gray_count)) << 24; //data[y * image_pitch + x] |= ((u32)(*bitsdata++) << 24); |