aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender
diff options
context:
space:
mode:
authorJacek Antonelli2010-09-23 19:35:15 -0500
committerJacek Antonelli2010-09-23 19:35:15 -0500
commitf428c723fab91adb431a12e8ad70263b6feafc07 (patch)
treed3a1d49d0b4a4c3f8c8270bcc142cd37f844cc2e /linden/indra/llrender
parentImprudence 1.3.0 RC3 released. (diff)
downloadmeta-impy-f428c723fab91adb431a12e8ad70263b6feafc07.zip
meta-impy-f428c723fab91adb431a12e8ad70263b6feafc07.tar.gz
meta-impy-f428c723fab91adb431a12e8ad70263b6feafc07.tar.bz2
meta-impy-f428c723fab91adb431a12e8ad70263b6feafc07.tar.xz
Use integer font sizes to avoid blurriness on some systems.
Diffstat (limited to 'linden/indra/llrender')
-rw-r--r--linden/indra/llrender/llfontregistry.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index b1d8c5c..2140dbd 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -442,12 +442,13 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
442 std::string font_path = local_path + *file_name_it; 442 std::string font_path = local_path + *file_name_it;
443 BOOL is_fallback = !is_first_found; 443 BOOL is_fallback = !is_first_found;
444 F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult()); 444 F32 size_mult = (is_fallback ? 1 : match_desc->getSizeMult());
445 if (!fontp->loadFace(font_path, point_size * size_mult, 445 F32 size = (F32)llround(point_size * size_mult);
446 if (!fontp->loadFace(font_path, size,
446 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback)) 447 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
447 { 448 {
448 font_path = sys_path + *file_name_it; 449 font_path = sys_path + *file_name_it;
449 450
450 if (!fontp->loadFace(font_path, point_size * size_mult, 451 if (!fontp->loadFace(font_path, size,
451 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback)) 452 LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
452 { 453 {
453 LL_INFOS_ONCE("LLFontRegistry") << "Couldn't load font " << *file_name_it << LL_ENDL; 454 LL_INFOS_ONCE("LLFontRegistry") << "Couldn't load font " << *file_name_it << LL_ENDL;