From 1b4aaa5f505518c1464ebcadda7549aa7c69675b Mon Sep 17 00:00:00 2001 From: ngosang Date: Tue, 27 Jan 2015 13:20:57 +0100 Subject: [PATCH] Suppress 4 gcc 4.9.2 warnings in CGUITTFont.cpp --- src/cguittfont/CGUITTFont.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cguittfont/CGUITTFont.cpp b/src/cguittfont/CGUITTFont.cpp index 92a24784e..170b26648 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 (s32 y = 0; y < bits.rows; ++y) + for (u32 y = 0; y < bits.rows; ++y) { u16* row = image_data; - for (s32 x = 0; x < bits.width; ++x) + for (u32 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 (s32 y = 0; y < bits.rows; ++y) + for (u32 y = 0; y < bits.rows; ++y) { u8* row = glyph_data; - for (s32 x = 0; x < bits.width; ++x) + for (u32 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);