| Index: src/ports/SkFontHost_win.cpp
|
| diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
|
| index 898aa42309daf97142558ac26a7738e0865f1a7e..25038dcf380a5824ffc368734c2241edb6c76e70 100644
|
| --- a/src/ports/SkFontHost_win.cpp
|
| +++ b/src/ports/SkFontHost_win.cpp
|
| @@ -1826,24 +1826,25 @@ SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
|
| info->fGlyphWidths.emplace_back(std::move(range));
|
| } else {
|
| info->setGlyphWidths(
|
| - glyphCount, glyphIDs, glyphIDsCount,
|
| - SkAdvancedTypefaceMetrics::GetAdvance(
|
| - [hdc](int gId, int16_t* advance) {
|
| - // Initialize the MAT2 structure to
|
| - // the identify transformation matrix.
|
| - static const MAT2 mat2 = {
|
| - SkScalarToFIXED(1), SkScalarToFIXED(0),
|
| - SkScalarToFIXED(0), SkScalarToFIXED(1)};
|
| - int flags = GGO_METRICS | GGO_GLYPH_INDEX;
|
| - GLYPHMETRICS gm;
|
| - if (GDI_ERROR == GetGlyphOutline(
|
| - hdc, gId, flags, &gm, 0, nullptr, &mat2)) {
|
| - return false;
|
| - }
|
| - SkASSERT(advance);
|
| - *advance = gm.gmCellIncX;
|
| - return true;
|
| - }));
|
| + glyphCount,
|
| + glyphIDs,
|
| + glyphIDsCount,
|
| + SkAdvancedTypefaceMetrics::GetAdvance([hdc](int gId, int16_t* advance) {
|
| + // Initialize the MAT2 structure to
|
| + // the identify transformation matrix.
|
| + static const MAT2 mat2 = {
|
| + SkScalarToFIXED(1), SkScalarToFIXED(0),
|
| + SkScalarToFIXED(0), SkScalarToFIXED(1)};
|
| + int flags = GGO_METRICS | GGO_GLYPH_INDEX;
|
| + GLYPHMETRICS gm;
|
| + if (GDI_ERROR == GetGlyphOutline(hdc, gId, flags, &gm, 0, nullptr, &mat2)) {
|
| + return false;
|
| + }
|
| + SkASSERT(advance);
|
| + *advance = gm.gmCellIncX;
|
| + return true;
|
| + })
|
| + );
|
| }
|
| }
|
|
|
|
|