diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-22 15:21:23 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-22 15:21:23 +0000 |
| commit | 4b18f5767ab1df7fedf0ff2e3a9eac7f7c500c36 (patch) | |
| tree | fab816c0bc89fb5c2901ba17d623c75980d30f3d /src/utils | |
| parent | b8f3655d492fc602c252f6fcc9aba3d37d8d59f4 (diff) | |
Clean up a few warnings on Windows x64.
git-svn-id: http://skia.googlecode.com/svn/trunk@10233 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkThreadUtils_win.cpp | 2 | ||||
| -rw-r--r-- | src/utils/win/SkIStream.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/SkThreadUtils_win.cpp b/src/utils/SkThreadUtils_win.cpp index 208ffded1b..a064d3b6b3 100644 --- a/src/utils/SkThreadUtils_win.cpp +++ b/src/utils/SkThreadUtils_win.cpp @@ -108,7 +108,7 @@ static unsigned int num_bits_set(DWORD_PTR mask) { static unsigned int nth_set_bit(unsigned int n, DWORD_PTR mask) { n %= num_bits_set(mask); for (unsigned int setBitsSeen = 0, currentBit = 0; true; ++currentBit) { - if (mask & (1 << currentBit)) { + if (mask & (static_cast<DWORD_PTR>(1) << currentBit)) { ++setBitsSeen; if (setBitsSeen > n) { return currentBit; diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp index 1d00611f79..7880fa0790 100644 --- a/src/utils/win/SkIStream.cpp +++ b/src/utils/win/SkIStream.cpp @@ -128,7 +128,7 @@ HRESULT SkIStream::CreateFromSkStream(SkStream* stream // ISequentialStream Interface HRESULT STDMETHODCALLTYPE SkIStream::Read(void* pv, ULONG cb, ULONG* pcbRead) { - *pcbRead = this->fSkStream->read(pv, cb); + *pcbRead = static_cast<ULONG>(this->fSkStream->read(pv, cb)); this->fLocation.QuadPart += *pcbRead; return (*pcbRead == cb) ? S_OK : S_FALSE; } |