commit 9548be3badb2e542035a20070cdfcd39e633f048
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 14 16:00:01 2012 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 14 16:00:01 2012 +0000
tree 6e37e5f09fcebd6c8bf0ce2229e4e15617457d72
parent 1c6307e36fd96894bd11727c995f9cf9991a7be1

landing https://codereview.appspot.com/6506117



git-svn-id: http://skia.googlecode.com/svn/trunk@5549 2bbb7eff-a529-9590-31e7-b0007b416f81

src/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index ba0afd8..0f3dded 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -753,15 +753,20 @@
     }
 
 #ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
-    SkScalar hintingScaleFactor = fRec.fHintingScaleFactor;
+    if (fRec.getHinting() == SkPaint::kNo_Hinting) {
+        fScaleX = SkScalarToFixed(sx);
+        fScaleY = SkScalarToFixed(sy);
+    } else {
+        SkScalar hintingScaleFactor = fRec.fHintingScaleFactor;
 
-    fScaleX = SkScalarToFixed(sx / hintingScaleFactor);
-    fScaleY = SkScalarToFixed(sy / hintingScaleFactor);
+        fScaleX = SkScalarToFixed(sx / hintingScaleFactor);
+        fScaleY = SkScalarToFixed(sy / hintingScaleFactor);
 
-    fMatrix22.xx *= hintingScaleFactor;
-    fMatrix22.xy *= hintingScaleFactor;
-    fMatrix22.yx *= hintingScaleFactor;
-    fMatrix22.yy *= hintingScaleFactor;
+        fMatrix22.xx *= hintingScaleFactor;
+        fMatrix22.xy *= hintingScaleFactor;
+        fMatrix22.yx *= hintingScaleFactor;
+        fMatrix22.yy *= hintingScaleFactor;
+    }
 #else
     fScaleX = SkScalarToFixed(sx);
     fScaleY = SkScalarToFixed(sy);