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 | |
| parent | e941457a0855d93d7e1f8e31c4e35ca319d64643 (diff) | |
Pulling in viewer-gcc4.6 freetype fixes
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rwxr-xr-x | indra/llrender/llfontfreetype.cpp | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index 096e40a429..cb86a21880 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -606,9 +606,9 @@ <key>archive</key> <map> <key>hash</key> - <string>9f8a9dc39fd7c3da0fb3533782d1fddf</string> + <string>ca95bbdabd2bed612af79a3704fdbe79</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/226814/arch/Linux/installer/freetype-2.3.9-linux-20110418.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/265843/arch/Linux/installer/freetype-2.3.9-linux-20121013.tar.bz2</string> </map> <key>name</key> <string>linux</string> 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++; } |