Fixed compiler error/warnings created by change in FreeType

cschreib · May 5, 2017 · 249a1a8 · 249a1a8
1 parent 112c4c9
commit 249a1a8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gui/impl/gui/gl/src/gui_gl_font.cpp b/gui/impl/gui/gl/src/gui_gl_font.cpp
@@ -67,7 +67,7 @@ font::font(const std::string& sFontFile, uint uiSize) : bKerning_(false)
             iMaxBearingY = mFace->glyph->metrics.horiBearingY;
 
         int iCharWidth = std::max(
-            mFace->glyph->bitmap.width + int(mFace->glyph->metrics.horiBearingX >> 6),
+            int(mFace->glyph->bitmap.width) + int(mFace->glyph->metrics.horiBearingX >> 6),
             int(mFace->glyph->advance.x >> 6)
         );
 
@@ -133,8 +133,8 @@ font::font(const std::string& sFontFile, uint uiSize) : bKerning_(false)
         {
             int iYBearing  = iMaxBearingY - (mFace->glyph->metrics.horiBearingY >> 6);
 
-            for (int j = 0; j < mFace->glyph->bitmap.rows;  ++j)
-            for (int i = 0; i < mFace->glyph->bitmap.width; ++i, ++sBuffer)
+            for (int j = 0; j < int(mFace->glyph->bitmap.rows);  ++j)
+            for (int i = 0; i < int(mFace->glyph->bitmap.width); ++i, ++sBuffer)
                 pTexture_->set_pixel(x + i + uiXBearing, y + j + iYBearing, ub32color(255, 255, 255, *sBuffer));
         }