Commit c33efa0dcfeeedee089c6c69d2ca69a5153e9963
2008-05-02T12:45:21
* Use a smaller logo on the User Guide's front page.
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
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 5b2aea2..753015b 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,7 +5,7 @@ htmldoc_DATA = html/doxygen.css
endif
IMAGES = \
- images/ftgldemo.jpg \
+ images/ftgl.png \
images/metrics.png \
$(NULL)
diff --git a/docs/ftgl.dox b/docs/ftgl.dox
index 465b606..3b045e3 100644
--- a/docs/ftgl.dox
+++ b/docs/ftgl.dox
@@ -1,6 +1,6 @@
/** \mainpage FTGL User Guide
- \image html ftgldemo.jpg
+ \image html ftgl.png
\section intro Introduction
@@ -26,7 +26,9 @@
FTGL supports 6 font output types among 3 groups: raster fonts, vector fonts
and texture fonts, which are a mixture of both. Each font type has its
- advantages and disadvantages The two raster types are:
+ advantages and disadvantages.
+
+ The two raster types are:
- Bitmapped
- Antialiased pixmapped
diff --git a/docs/images/ftgl.png b/docs/images/ftgl.png
new file mode 100644
index 0000000..a9fc1e8
Binary files /dev/null and b/docs/images/ftgl.png differ
diff --git a/docs/images/ftgldemo.jpg b/docs/images/ftgldemo.jpg
deleted file mode 100644
index 55addde..0000000
Binary files a/docs/images/ftgldemo.jpg and /dev/null differ
diff --git a/src/FTGlyph/FTTextureGlyph.cpp b/src/FTGlyph/FTTextureGlyph.cpp
index 4407f64..b547d6d 100644
--- a/src/FTGlyph/FTTextureGlyph.cpp
+++ b/src/FTGlyph/FTTextureGlyph.cpp
@@ -65,6 +65,10 @@ FTTextureGlyphImpl::FTTextureGlyphImpl(FT_GlyphSlot glyph, int id, int xOffset,
destHeight(0),
glTextureID(id)
{
+ /* FIXME: need to propagate the render mode all the way down to
+ * here in order to get FT_RENDER_MODE_MONO aliased fonts.
+ */
+
err = FT_Render_Glyph(glyph, FT_RENDER_MODE_NORMAL);
if(err || glyph->format != ft_glyph_format_bitmap)
{