commit 1dccc9f3e889a5b702ec201129db689ab64a5eb8
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 27 08:13:22 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 27 08:13:22 2012 -0700
tree b6b073ba09659a6382005401994401fb72f70382
parent 5f421caf157bf54c2cfd2ded128ede466e761d4d
parent 372648a70bbb2778edcdad588c8d133a6c55a033

am 372648a7: Merge "Fix access to freed memory"

* commit '372648a70bbb2778edcdad588c8d133a6c55a033':
  Fix access to freed memory

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 621c94a..fc60ef9 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -63,6 +63,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 {                                                                                \
@@ -892,7 +902,7 @@
 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);
 }