diff options
author | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-18 19:20:39 +0000 |
---|---|---|
committer | epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-01-18 19:20:39 +0000 |
commit | b90113dd3de76eef48679f74a9134dcb73d32a7c (patch) | |
tree | a3c5644558921d2d0e1f084220efd27ab7fa0e6d /src | |
parent | 77e498e6ba5603b64988c3243ee97b6165147298 (diff) |
Remove apparent SkIntToScalar(SkScalar) call in SkScalerContext_FreeType
This change seems to fix the following assertion failure we have been seeing
in the Skia_Linux_Fixed_Debug build since http://code.google.com/p/skia/source/detail?r=3059 :
drawing... bitmapfilters [540 330]
../include/core/SkFixed.h:67: failed assertion "n >= -32768 && n <= 32767"
Review URL: https://codereview.appspot.com/5557049
git-svn-id: http://skia.googlecode.com/svn/trunk@3066 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 61efb958ba..a58cd3702c 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -1422,7 +1422,7 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* mx, emboldenOutline(&fFace->glyph->outline); } FT_Outline_Get_CBox(&fFace->glyph->outline, &bbox); - x_height = SkIntToScalar(bbox.yMax) / 64; + x_height = SkFixedToScalar(SkFDot6ToFixed(bbox.yMax)); } else { x_height = 0; } |