From: Craig Robbins Date: Fri, 6 Feb 2015 12:58:11 +0000 (+1000) Subject: Fix warnings in CGUITTFont.cpp X-Git-Tag: 0.4.12~25 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0904884ad47b5df67a5a26360d3bb35de1e76e5c;p=oweals%2Fminetest.git Fix warnings in CGUITTFont.cpp --- 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(255.0f * (static_cast(*row++) / gray_count)) << 24; //data[y * image_pitch + x] |= ((u32)(*bitsdata++) << 24);