* Rename FTTextureFontImpl::MakeGlyph to FTTextureFontImpl::MakeGlyphImpl to avoid confusion.
diff --git a/src/FTFont/FTTextureFont.cpp b/src/FTFont/FTTextureFont.cpp
index b3e9e80..e74f624 100644
--- a/src/FTFont/FTTextureFont.cpp
+++ b/src/FTFont/FTTextureFont.cpp
@@ -68,7 +68,7 @@ FTGlyph* FTTextureFont::MakeGlyph(FT_GlyphSlot ftGlyph)
return NULL;
}
- return myimpl->MakeGlyph(ftGlyph);
+ return myimpl->MakeGlyphImpl(ftGlyph);
}
@@ -133,7 +133,7 @@ FTTextureFontImpl::~FTTextureFontImpl()
}
-FTGlyph* FTTextureFontImpl::MakeGlyph(FT_GlyphSlot ftGlyph)
+FTGlyph* FTTextureFontImpl::MakeGlyphImpl(FT_GlyphSlot ftGlyph)
{
glyphHeight = static_cast<int>(charSize.Height() + 0.5);
glyphWidth = static_cast<int>(charSize.Width() + 0.5);
diff --git a/src/FTFont/FTTextureFontImpl.h b/src/FTFont/FTTextureFontImpl.h
index 8989bc9..893726b 100644
--- a/src/FTFont/FTTextureFontImpl.h
+++ b/src/FTFont/FTTextureFontImpl.h
@@ -88,7 +88,7 @@ class FTTextureFontImpl : public FTFontImpl
/**
* Create an FTTextureGlyph object for the base class.
*/
- FTGlyph* MakeGlyph(FT_GlyphSlot ftGlyph);
+ FTGlyph* MakeGlyphImpl(FT_GlyphSlot ftGlyph);
/**
* Get the size of a block of memory required to layout the glyphs