From dc08e3972d36a63dd477de0de005b3e81a5674d9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 26 May 2016 14:47:42 +0200 Subject: FIXUP:[Backport] SkFontHost_FreeType constructor to correctly release resources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While it doesn't appear to make a difference. The original conversion is SkFixedToFDot6, so keep using that. Change-Id: I9635d8f3c115b482530926980eda4f397b7156cb Reviewed-by: Michael Brüning --- chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp b/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp index 07857ff953c..a35c0f8ce08 100644 --- a/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp +++ b/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp @@ -919,7 +919,7 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface, const S } if (FT_IS_SCALABLE(ftFace)) { - err = FT_Set_Char_Size(ftFace.get(), SkFixedToScalar(fScaleX), SkFixedToScalar(fScaleY), 72, 72); + err = FT_Set_Char_Size(ftFace.get(), SkFixedToFDot6(fScaleX), SkFixedToFDot6(fScaleY), 72, 72); if (err != 0) { SkDEBUGF(("FT_Set_CharSize(%08x, 0x%x, 0x%x) returned 0x%x\n", ftFace.get(), fScaleX, fScaleY, err)); -- cgit v1.2.3