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

Timestamp:

07/23/15 17:29:49 (10 years ago)

Author:

epyon

Message:

• massive amount of std::string removal
• removed slurp, use filesystem::slurp instead
• lua_values const_string support
• several bugfixes
• program_manager and shader loading without std::string/std::stream

File:

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

trunk/src/gfx/texture_font.cc

@@ -29 +29 @@
 }
 
-texture_font::texture_font( texture_atlas* atlas, const char * filename, float size )
-        : m_atlas( atlas ), m_filename(filename), m_size( size ), 
+texture_font::texture_font( texture_atlas* atlas, const string_view& filename, float size )
+        : m_atlas( atlas ), m_filename( filename ), m_size( size ),
         m_height(0), m_linegap(0), m_ascender(0), m_descender(0),
         m_hinting( true ), m_filtering( true ), m_rlibrary( nullptr ), m_rface( nullptr )
@@ -53 +53 @@
         NV_CHECK_FREETYPE_ERROR( error, "error on FT_Init_FreeType, code - ", error );
 
-        error = FT_New_Face( reinterpret_cast<FT_Library>(m_rlibrary), filename, 0, reinterpret_cast<FT_Face*>(&m_rface) );
+        error = FT_New_Face( reinterpret_cast<FT_Library>(m_rlibrary), filename.data(), 0, reinterpret_cast<FT_Face*>(&m_rface) );
         NV_CHECK_FREETYPE_ERROR( error, "error on FT_New_Face, code - ", error );