diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-21 23:00:41 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-21 23:00:41 +0000 |
| commit | 3d21f21cac33743e7aedace9abf0473c5063199f (patch) | |
| tree | c83018d3534a65ecd7acc9889ef5d42fd3eaee6d | |
| parent | 72cf4fcafa54cfa04c5ec7cb8eaa3acb144712dd (diff) | |
Fix r13897.
git-svn-id: http://skia.googlecode.com/svn/trunk@13898 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 6 | ||||
| -rw-r--r-- | src/ports/SkRemotableFontMgr_win_dw.cpp | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index 52cb450e99..b3f43be875 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -29,7 +29,9 @@ public: SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy) : fImpl(SkRef(impl)), fProxy(SkRef(proxy)) { - fOnce = SK_ONCE_INIT; + fOnce.done = false; + fOnce.lock.shouldBeZero = 0; + SkDEBUGCODE(fOnce.lock.thisIsPrivate = 0;) } protected: @@ -64,7 +66,7 @@ private: SkAutoTUnref<SkRemotableFontMgr> fProxy; struct DataEntry { - int fDataId; // key1 + uint32_t fDataId; // key1 int fTtcIndex; // key2 SkTypeface* fTypeface; // value: weak ref to typeface diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp index 50fc5d4a38..45f196b5d4 100644 --- a/src/ports/SkRemotableFontMgr_win_dw.cpp +++ b/src/ports/SkRemotableFontMgr_win_dw.cpp @@ -451,7 +451,8 @@ public: identity); WCHAR str[16]; - UINT32 strLen = SkUTF16_FromUnichar(character, reinterpret_cast<uint16_t*>(str)); + UINT32 strLen = static_cast<UINT32>( + SkUTF16_FromUnichar(character, reinterpret_cast<uint16_t*>(str))); SkTScopedComPtr<IDWriteTextLayout> fallbackLayout; HR_GENERAL(dwFactory->CreateTextLayout(str, strLen, fallbackFormat.get(), 200.0f, 200.0f, |