commit 4b18f5767ab1df7fedf0ff2e3a9eac7f7c500c36
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 22 15:21:23 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Jul 22 15:21:23 2013 +0000
tree fab816c0bc89fb5c2901ba17d623c75980d30f3d
parent b8f3655d492fc602c252f6fcc9aba3d37d8d59f4

Clean up a few warnings on Windows x64.



git-svn-id: http://skia.googlecode.com/svn/trunk@10233 2bbb7eff-a529-9590-31e7-b0007b416f81

src/utils/SkThreadUtils_win.cpp

diff --git a/src/utils/SkThreadUtils_win.cpp b/src/utils/SkThreadUtils_win.cpp
index 208ffde..a064d3b 100644
--- a/src/utils/SkThreadUtils_win.cpp
+++ b/src/utils/SkThreadUtils_win.cpp
@@ -108,7 +108,7 @@
 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;

src/utils/win/SkIStream.cpp

diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
index 1d00611..7880fa0 100644
--- a/src/utils/win/SkIStream.cpp
+++ b/src/utils/win/SkIStream.cpp
@@ -128,7 +128,7 @@
 
 // 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;
 }