diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-13 01:39:41 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-13 01:39:41 +0000 |
| commit | f974374789db67a242d09cdd2a35076a7c12cda8 (patch) | |
| tree | 42fd76edec17290e8909f00ced7e67d607ecbb89 /indra | |
| parent | e941457a0855d93d7e1f8e31c4e35ca319d64643 (diff) | |
Pulling in viewer-gcc4.6 freetype fixes
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llrender/llfontfreetype.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 7452bdf02b..058bef43a5 100755 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -485,11 +485,9 @@ void LLFontFreetype::renderGlyph(U32 glyph_index) const if (mFTFace == NULL) return; - int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_FORCE_AUTOHINT); - llassert(!error); + llassert_always(! FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_FORCE_AUTOHINT) ); - error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode); - llassert(!error); + llassert_always(! FT_Render_Glyph(mFTFace->glyph, gFontRenderMode) ); mRenderGlyphCount++; } |