Commit 68f91fa80b8b8947b74b5e039e7491b45bd11101

henry 2002-12-21T05:08:12

Removed DoAdvance function

diff --git a/include/FTFont.h b/include/FTFont.h
index de8ca59..c140323 100755
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -198,16 +198,6 @@ class FTGL_EXPORT FTFont
         
     private:        
         /**
-         * Get the advance width for a character.
-         * This function does an implicit conversion on it's arguments.
-         *
-         * @param chr       current character
-         * @param nextChr   next character
-         * @return          advance width
-         */
-        inline float DoAdvance( const unsigned int chr, const unsigned int nextChr);
-
-        /**
          * Render a character
          * This function does an implicit conversion on it's arguments.
          * 
diff --git a/src/FTFont.cpp b/src/FTFont.cpp
index 84072de..14540a3 100755
--- a/src/FTFont.cpp
+++ b/src/FTFont.cpp
@@ -164,7 +164,8 @@ float FTFont::Advance( const wchar_t* string)
 
     while( *c)
     {
-        width += DoAdvance( *c, *(c + 1));
+        CheckGlyph( *c);
+        width += glyphList->Advance( *c, *(c + 1));
         ++c;
     }
 
@@ -179,22 +180,15 @@ float FTFont::Advance( const char* string)
 
     while( *c)
     {
-        width += DoAdvance( *c, *(c + 1));
+        CheckGlyph( *c);
+        width += glyphList->Advance( *c, *(c + 1));
         ++c;
     }
-
+    
     return width;
 }
 
 
-float FTFont::DoAdvance( const unsigned int chr, const unsigned int nextChr)
-{
-    CheckGlyph( chr);
-
-    return glyphList->Advance( chr, nextChr);
-}
-
-
 void FTFont::Render( const char* string )
 {
     const unsigned char* c = (unsigned char*)string;