Changeset 24

Timestamp:

05/18/13 10:55:38 (12 years ago)

Author:

melon

Message:

Fixed typos (gylph => glyph)

Location:

trunk

Files:

• nv/gl/texture_font.hh (modified) (4 diffs)
• nv/lib/freetype2.hh (modified) (1 diff)
• src/gl/texture_font.cc (modified) (5 diffs)

trunk/nv/gl/texture_font.hh

@@ -17 +17 @@
 namespace nv
 {
-        struct texture_gylph
+        struct texture_glyph
         {
             uint16 charcode;
@@ -27 +27 @@
                 std::unordered_map< uint16, float > kerning;
 
-                texture_gylph();
+                texture_glyph();
                 float get_kerning( const uint16 charcode );
         };
@@ -35 +35 @@
         public:
                 texture_font( texture_atlas* atlas, const char * filename, float size );
-                const texture_gylph* get_gylph( uint16 charcode ) const;
+                const texture_glyph* get_glyph( uint16 charcode ) const;
                 bool load_glyphs( const std::string& codes );
                 ~texture_font();
@@ -41 +41 @@
                 void generate_kerning();
         private:
-                std::unordered_map< uint16, texture_gylph > m_gylphs;
+                std::unordered_map< uint16, texture_glyph > m_glyphs;
                 texture_atlas* m_atlas;
                 std::string m_filename;

trunk/nv/lib/freetype2.hh

@@ -720 +720 @@
 #define FT_FSTYPE_BITMAP_EMBEDDING_ONLY         0x0200
 
-  /* ftgylph.h */
+  /* ftglyph.h */
 
   typedef struct FT_Glyph_Class_  FT_Glyph_Class;

trunk/src/gl/texture_font.cc

@@ -12 +12 @@
 using namespace nv;
 
-texture_gylph::texture_gylph()
+texture_glyph::texture_glyph()
         : charcode(0), size(0,0), offset(0,0), advance(0.f,0.f), tl(0.f,0.f), br(0.f,0.f)
 {
 }
 
-float texture_gylph::get_kerning( const uint16 charcode )
+float texture_glyph::get_kerning( const uint16 charcode )
 {
         auto i = kerning.find( charcode );
@@ -61 +61 @@
 }
 
-const texture_gylph* texture_font::get_gylph( uint16 charcode ) const
+const texture_glyph* texture_font::get_glyph( uint16 charcode ) const
 {
-        auto i = m_gylphs.find( charcode );
-        if ( i == m_gylphs.end() )
+        auto i = m_glyphs.find( charcode );
+        if ( i == m_glyphs.end() )
         {
                 return nullptr;
@@ -101 +101 @@
                 FT_UInt glyph_index = FT_Get_Char_Index( face, c ); 
                 FT_Error error = FT_Load_Glyph( face, glyph_index, flags ); 
-                if ( error ) throw std::runtime_error( "FT_Error while loading gylphs" );
+                if ( error ) throw std::runtime_error( "FT_Error while loading glyphs" );
 
                 FT_GlyphSlot slot   = face->glyph;
@@ -114 +114 @@
                 if ( r.pos.x < 0 ) 
                 {
-                        throw std::runtime_error( "Atlas full while loading gylphs" );
+                        throw std::runtime_error( "Atlas full while loading glyphs" );
                 }
                 r.size.x -= 1;
@@ -120 +120 @@
                 m_atlas->set_region( r, ft_bitmap.buffer, ft_bitmap.pitch );
 
-                m_gylphs[ c ] = texture_gylph();
-                texture_gylph* g = &(m_gylphs.find( c )->second);
+                m_glyphs[ c ] = texture_glyph();
+                texture_glyph* g = &(m_glyphs.find( c )->second);
 
                 g->charcode = c;