aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-10-09 12:17:09 -0700
committerSteve Kondik <shade@chemlab.org>2012-10-09 12:17:09 -0700
commit497936662ca50b84592e6147016e4c058976f1c5 (patch)
tree48e32cb97dcfc40f0516b893741e2fd1982cdbae
parent6ab870723b749ffd632fecd648704d80b581fcf0 (diff)
parent2cc242762de47ca4ca7706ead3bb0d114a5aa523 (diff)
downloadexternal_skia-497936662ca50b84592e6147016e4c058976f1c5.zip
external_skia-497936662ca50b84592e6147016e4c058976f1c5.tar.gz
external_skia-497936662ca50b84592e6147016e4c058976f1c5.tar.bz2
Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/external/skia into aosp-merge
-rw-r--r--src/ports/SkFontHost_FreeType.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 3cd9f85..3277f50 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -65,6 +65,16 @@
#define SK_GAMMA_EXPONENT 2.2
#endif
+// hand-tuned value to reduce outline embolden strength
+#ifndef SK_OUTLINE_EMBOLDEN_DIVISOR
+ #ifdef SK_BUILD_FOR_ANDROID
+ #define SK_OUTLINE_EMBOLDEN_DIVISOR 34
+ #else
+ #define SK_OUTLINE_EMBOLDEN_DIVISOR 24
+ #endif
+#endif
+
+
#ifdef SK_DEBUG
#define SkASSERT_CONTINUE(pred) \
do { \
@@ -900,7 +910,7 @@ FT_Error SkScalerContext_FreeType::setupSize() {
void SkScalerContext_FreeType::emboldenOutline(FT_Outline* outline) {
FT_Pos strength;
strength = FT_MulFix(fFace->units_per_EM, fFace->size->metrics.y_scale)
- / 24;
+ / SK_OUTLINE_EMBOLDEN_DIVISOR;
FT_Outline_Embolden(outline, strength);
}