diff options
| author | Richard Linden <none@none> | 2010-07-27 10:30:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 10:30:17 -0700 |
| commit | 0f2f597e7aa5011061c3ea1fef5867814ee3a5b2 (patch) | |
| tree | 72a2fcddec5d08ce9db9b97984b884bb0943e19f /indra/llrender/llfontfreetype.cpp | |
| parent | 0fde0686744b2c17c0ea4c0163da45e8e4648381 (diff) | |
| parent | 6cc6f816780e64c5fb1e17a22fb5e473e75efe69 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llfontfreetype.cpp')
| -rw-r--r-- | indra/llrender/llfontfreetype.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index a86bbbffff..0a16b5120a 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -259,10 +259,10 @@ F32 LLFontFreetype::getXAdvance(llwchar wch) const } else { - gi = get_if_there(mCharGlyphInfoMap, (llwchar)0, (LLFontGlyphInfo*)NULL); - if (gi) + char_glyph_info_map_t::iterator found_it = mCharGlyphInfoMap.find((llwchar)0); + if (found_it != mCharGlyphInfoMap.end()) { - return gi->mXAdvance; + return found_it->second->mXAdvance; } } |