Commit be741365a423f8cd34bff3ef5143bc3fda8b0f8e
2001-08-27T22:03:36
If we get a NULL FT_Glyph we now report an error.
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
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 0997433..e301c9c 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -28,6 +28,10 @@ bool FTGLBitmapFont::MakeGlyphList()
tempGlyph = new FTBitmapGlyph( *ftGlyph, c);
glyphList->Add( tempGlyph);
}
+ else
+ {
+ err = face.Error();
+ }
}
return !err;
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 0dccc64..092ba9c 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -26,6 +26,10 @@ bool FTGLOutlineFont::MakeGlyphList()
tempGlyph = new FTVectorGlyph( *ftGlyph, n);
glyphList->Add( tempGlyph);
}
+ else
+ {
+ err = face.Error();
+ }
}
return !err;
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index b27184f..f564132 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -28,6 +28,10 @@ bool FTGLPixmapFont::MakeGlyphList()
tempGlyph = new FTPixmapGlyph( *ftGlyph, c);
glyphList->Add( tempGlyph);
}
+ else
+ {
+ err = face.Error();
+ }
}
return !err;
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index 073e505..b1cd35d 100755
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -25,6 +25,10 @@ bool FTGLPolygonFont::MakeGlyphList()
tempGlyph = new FTPolyGlyph( *ftGlyph, n);
glyphList->Add( tempGlyph);
}
+ else
+ {
+ err = face.Error();
+ }
}
return !err;
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index b44a908..d5a6124 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -137,6 +137,10 @@ unsigned int FTGLTextureFont::FillGlyphs( unsigned int glyphStart, int id, int w
currTextV = (float)currentTextY / (float)height;
}
}
+ else
+ {
+ err = face.Error();
+ }
}
return n;