From b90113dd3de76eef48679f74a9134dcb73d32a7c Mon Sep 17 00:00:00 2001 From: "epoger@google.com" Date: Wed, 18 Jan 2012 19:20:39 +0000 Subject: 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 --- src/ports/SkFontHost_FreeType.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ports/SkFontHost_FreeType.cpp') 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; } -- cgit v1.2.3