AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SkFontMgr_DirectWrite::onMakeFromStreamArgs works on win 7

Browse Source 
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>
This commit is contained in:
Bruce Wang 2018-06-07 17:19:14 -04:00 committed by Skia Commit-Bot
parent 2e361a3c34
commit 7731073386
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ports/SkFontMgr_win_dw.cpp
View File

@ -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