Changeset 121 for trunk/src/gfx/texture_font.cc

Timestamp:

06/15/13 17:47:57 (12 years ago)

Author:

epyon

Message:

• Nova builds with -Weverything/-Wall/-pedantic/etc on: on MSVC 2012 on GCC 4.6.3 on clang 3.2
• ... without a single fucking warning.

File:

• trunk/src/gfx/texture_font.cc (modified) (3 diffs)

trunk/src/gfx/texture_font.cc

@@ -17 +17 @@
 }
 
-float texture_glyph::get_kerning( const uint16 charcode )
+float texture_glyph::get_kerning( const uint16 other )
 {
-        auto i = kerning.find( charcode );
+        auto i = kerning.find( other );
         return i != kerning.end() ? i->second : 0.0f;
 }
@@ -118 +118 @@
         } 
 
-        for ( char c : codes )
+        for ( char ch : codes )
         {
+                uint16 c = static_cast<uint16>( ch );
                 FT_UInt glyph_index = FT_Get_Char_Index( face, c ); 
                 FT_Error error = FT_Load_Glyph( face, glyph_index, flags ); 
@@ -136 +137 @@
                 int ft_glyph_top    = slot->bitmap_top;
                 int ft_glyph_left   = slot->bitmap_left;
-                int reg_width       = ft_bitmap_width / (depth > 3 ? 3 : depth);
+                int reg_width       = ft_bitmap_width / (depth > 3 ? 3 : (int)depth);
 
                 glm::ivec2 gsize( reg_width + 1, ft_bitmap_rows + 1 );