Commit 6355a5d04a1fa8c8a05f96cf836e439717dc9e95

henry 2004-05-09T07:09:41

Renamed functions for clarity

diff --git a/include/FTCharmap.h b/include/FTCharmap.h
index 69bb047..30a07c1 100644
--- a/include/FTCharmap.h
+++ b/include/FTCharmap.h
@@ -78,7 +78,16 @@ class FTGL_EXPORT FTCharmap
          * @return      The FTGlyphContainer index for the character or zero
          *              if it wasn't found
          */
-        unsigned int CharIndex( const unsigned int characterCode);
+        signed int GlyphListIndex( const unsigned int characterCode);
+
+        /**
+         * Get the font glyph index of the input character.
+         *
+         * @param characterCode The character code of the requested glyph in
+         *                      the current encoding eg apple roman.
+         * @return      The glyph index for the character.
+         */
+        signed int FontIndex( const unsigned int characterCode);
 
         /**
          * Set the FTGlyphContainer index of the character code.
@@ -91,15 +100,6 @@ class FTGL_EXPORT FTCharmap
         void InsertIndex( const unsigned int characterCode, const unsigned int containerIndex);
 
         /**
-         * Get the font glyph index of the input character.
-         *
-         * @param characterCode The character code of the requested glyph in
-         *                      the current encoding eg apple roman.
-         * @return      The glyph index for the character.
-         */
-        unsigned int GlyphIndex( const unsigned int characterCode);
-
-        /**
          * Queries for errors.
          *
          * @return  The current error code. Zero means no error.
diff --git a/src/FTCharmap.cpp b/src/FTCharmap.cpp
index 31f6aa3..07ffac6 100644
--- a/src/FTCharmap.cpp
+++ b/src/FTCharmap.cpp
@@ -44,20 +44,19 @@ bool FTCharmap::CharMap( FT_Encoding encoding)
 }
 
 
-unsigned int FTCharmap::CharIndex( unsigned int characterCode )
+signed int FTCharmap::GlyphListIndex( unsigned int characterCode )
 {
     return charMap.find( characterCode);
 }
 
 
-void FTCharmap::InsertIndex( const unsigned int characterCode, const unsigned int containerIndex)
+signed int FTCharmap::FontIndex( unsigned int characterCode )
 {
-    charMap.insert( characterCode, containerIndex);
+    return FT_Get_Char_Index( ftFace, characterCode);
 }
 
 
-unsigned int FTCharmap::GlyphIndex( const unsigned int characterCode)
+void FTCharmap::InsertIndex( const unsigned int characterCode, const unsigned int containerIndex)
 {
-    unsigned int glyphIndex = FT_Get_Char_Index( ftFace, characterCode);
-    return glyphIndex;
+    charMap.insert( characterCode, containerIndex);
 }