Commit 7d3852f93649de39f5aa130ad59702a5c062a24b
2008-05-05T14:52:17
* Rename FTFontImpl::base to FTFontImpl::intf.
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 62 63 64 65 66 67
diff --git a/src/FTFont/FTFont.cpp b/src/FTFont/FTFont.cpp
index f589fcf..c8c9819 100644
--- a/src/FTFont/FTFont.cpp
+++ b/src/FTFont/FTFont.cpp
@@ -224,7 +224,7 @@ FT_Error FTFont::Error() const
FTFontImpl::FTFontImpl(FTFont *ftFont, char const *fontFilePath) :
face(fontFilePath),
useDisplayLists(true),
- base(ftFont),
+ intf(ftFont),
glyphList(0)
{
err = face.Error();
@@ -239,7 +239,7 @@ FTFontImpl::FTFontImpl(FTFont *ftFont, const unsigned char *pBufferBytes,
size_t bufferSizeInBytes) :
face(pBufferBytes, bufferSizeInBytes),
useDisplayLists(true),
- base(ftFont),
+ intf(ftFont),
glyphList(0)
{
err = face.Error();
@@ -535,16 +535,15 @@ bool FTFontImpl::CheckGlyph(const unsigned int characterCode)
* FTTextureGlyph: FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP
*/
unsigned int glyphIndex = glyphList->FontIndex(characterCode);
- FT_GlyphSlot ftGlyph = face.Glyph(glyphIndex, FT_LOAD_NO_HINTING);
-
- if(!ftGlyph)
+ FT_GlyphSlot ftSlot = face.Glyph(glyphIndex, FT_LOAD_NO_HINTING);
+ if(!ftSlot)
{
err = face.Error();
return false;
}
- FTGlyph* tempGlyph = base->MakeGlyph(ftGlyph);
- if(NULL == tempGlyph)
+ FTGlyph* tempGlyph = intf->MakeGlyph(ftSlot);
+ if(!tempGlyph)
{
if(0 == err)
{
@@ -553,6 +552,7 @@ bool FTFontImpl::CheckGlyph(const unsigned int characterCode)
return false;
}
+
glyphList->Add(tempGlyph, characterCode);
return true;
diff --git a/src/FTFont/FTFontImpl.h b/src/FTFont/FTFontImpl.h
index 97cb51b..df4a823 100644
--- a/src/FTFont/FTFontImpl.h
+++ b/src/FTFont/FTFontImpl.h
@@ -122,9 +122,9 @@ class FTFontImpl
private:
/**
- * A link back to the object of which we are the implementation.
+ * A link back to the interface of which we are the implementation.
*/
- FTFont *base;
+ FTFont *intf;
/**
* Render a character.