diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-26 14:47:42 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-05-26 12:58:54 +0000 |
| commit | dc08e3972d36a63dd477de0de005b3e81a5674d9 (patch) | |
| tree | 2b821fdcb3f36f6e60c3449f88823b45128ab94d | |
| parent | 210c533bcfd207640617642dc4e79c638845c560 (diff) | |
FIXUP:[Backport] SkFontHost_FreeType constructor to correctly release resourcesv5.6.1
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 <michael.bruning@theqtcompany.com>
| -rw-r--r-- | chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |