diff options
| author |  Bruce Wang <brucewang@google.com> | 2018-06-07 17:19:14 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-07 21:49:06 +0000 |
| commit | 7731073386a461f2bba0d650a6da94bc76941f5d (patch) | |
| tree | 5e0de4e0c9b76b823f24baceabc345019d89be50 /src/ports | |
| parent | 2e361a3c34dd021f64c51c22fad26a187c436043 (diff) | |
SkFontMgr_DirectWrite::onMakeFromStreamArgs works on win 7
Change-Id: I7c7f624a04d3c337de834cc776abcee051309844
Reviewed-on: https://skia-review.googlesource.com/133061
Commit-Queue: Ben Wagner <bungeman@google.com>
Commit-Queue: Bruce Wang <brucewang@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index b92ffaf797..c6f15d5ce8 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -974,8 +974,7 @@ sk_sp<SkTypeface> SkFontMgr_DirectWrite::onMakeFromStreamArgs(std::unique_ptr<Sk #if defined(NTDDI_WIN10_RS3) && NTDDI_VERSION >= NTDDI_WIN10_RS3 SkTScopedComPtr<IDWriteFontFace5> fontFace5; - HRN(fontFace->QueryInterface(&fontFace5)); - if (fontFace5 && fontFace5->HasVariations()) { + if (SUCCEEDED(fontFace->QueryInterface(&fontFace5)) && fontFace5->HasVariations()) { UINT32 fontAxisCount = fontFace5->GetFontAxisValueCount(); UINT32 argsCoordCount = args.getVariationDesignPosition().coordinateCount; SkAutoSTMalloc<8, DWRITE_FONT_AXIS_VALUE> fontAxisValues(fontAxisCount); @@ -1000,7 +999,7 @@ sk_sp<SkTypeface> SkFontMgr_DirectWrite::onMakeFromStreamArgs(std::unique_ptr<Sk fontAxisCount, &fontFace5_Out)); fontFace.reset(); - fontFace5_Out->QueryInterface(&fontFace); + HRN(fontFace5_Out->QueryInterface(&fontFace)); } #endif |