Commit f73f63a9a25be609efcfc033a9552632c0b9a6ec
2002-11-27T07:46:25
Changes to the glyph loading flags
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 68 69 70 71 72 73 74 75 76 77 78
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 70ff266..018bd0e 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -17,8 +17,6 @@ FTGlyph* FTGLBitmapFont::MakeGlyph( unsigned int g)
if( ftGlyph)
{
FTBitmapGlyph* tempGlyph = new FTBitmapGlyph( *ftGlyph);
-// FT_Done_Glyph( *ftGlyph );
-
return tempGlyph;
}
diff --git a/src/FTGLExtrdFont.cpp b/src/FTGLExtrdFont.cpp
index b897b30..12c92bc 100644
--- a/src/FTGLExtrdFont.cpp
+++ b/src/FTGLExtrdFont.cpp
@@ -13,7 +13,7 @@ FTGLExtrdFont::~FTGLExtrdFont()
FTGlyph* FTGLExtrdFont::MakeGlyph( unsigned int g)
{
- FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+ FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING);
if( ftGlyph)
{
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 4db44ba..71e5718 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -12,7 +12,7 @@ FTGLOutlineFont::~FTGLOutlineFont()
FTGlyph* FTGLOutlineFont::MakeGlyph( unsigned int g)
{
- FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+ FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING);
if( ftGlyph)
{
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index 071bc48..0658b2b 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -12,7 +12,7 @@ FTGLPixmapFont::~FTGLPixmapFont()
FTGlyph* FTGLPixmapFont::MakeGlyph( unsigned int g)
{
- FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+ FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING);
if( ftGlyph)
{
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index 4fc8f28..9ebd286 100755
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -12,7 +12,7 @@ FTGLPolygonFont::~FTGLPolygonFont()
FTGlyph* FTGLPolygonFont::MakeGlyph( unsigned int g)
{
- FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_DEFAULT);
+ FT_Glyph* ftGlyph = face.Glyph( g, FT_LOAD_NO_HINTING);
if( ftGlyph)
{
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 1a2c223..31bfe8a 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -77,7 +77,7 @@ FTGlyph* FTGLTextureFont::MakeGlyph( unsigned int g)
xOffset, yOffset, textureWidth, textureHeight);
// FIXME ceiling
- xOffset += tempGlyph->BBox().x2 - tempGlyph->BBox().x1 + padding;
+ xOffset += static_cast<int>( tempGlyph->BBox().upperX - tempGlyph->BBox().lowerX + padding);
--remGlyphs;
return tempGlyph;