Commit 231a1d7eca6f066653dde8510601ce759e2c5ab8
2004-10-12T01:06:11
Got rid of the DoRender function.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61
diff --git a/include/FTFont.h b/include/FTFont.h
index 946bf80..bce8de6 100755
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -252,15 +252,6 @@ class FTGL_EXPORT FTFont
private:
/**
- * Render a character
- * This function does an implicit conversion on it's arguments.
- *
- * @param chr current character
- * @param nextChr next character
- */
- inline void DoRender( const unsigned int chr, const unsigned int nextChr);
-
- /**
* Check that the glyph at <code>chr</code> exist. If not load it.
*
* @param chr character index
diff --git a/src/FTFont.cpp b/src/FTFont.cpp
index 05d70a1..f519f33 100755
--- a/src/FTFont.cpp
+++ b/src/FTFont.cpp
@@ -249,7 +249,10 @@ void FTFont::Render( const char* string )
while( *c)
{
- DoRender( *c, *(c + 1));
+ if(CheckGlyph( *c))
+ {
+ pen = glyphList->Render( *c, *(c + 1), pen);
+ }
++c;
}
}
@@ -262,20 +265,15 @@ void FTFont::Render( const wchar_t* string )
while( *c)
{
- DoRender( *c, *(c + 1));
+ if(CheckGlyph( *c))
+ {
+ pen = glyphList->Render( *c, *(c + 1), pen);
+ }
++c;
}
}
-void FTFont::DoRender( const unsigned int chr, const unsigned int nextChr)
-{
- if(CheckGlyph( chr))
- {
- pen = glyphList->Render( chr, nextChr, pen);
- }
-}
-
bool FTFont::CheckGlyph( const unsigned int characterCode)
{
if( NULL == glyphList->Glyph( characterCode))