commit | ffe39bd3b66eb5090684959e7f2409346ab72d93 | [log] [tgz] |
---|---|---|
author | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu May 17 15:38:00 2012 +0000 |
committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu May 17 15:38:00 2012 +0000 |
tree | a57a3e648b5bfaa8d6fd3fb7dd40352d879320c8 | |
parent | 5b94153a7b039a9269a8aabbe8f0da0e878e3978 [diff] [blame] |
Fix type errors and a few warnings for Visual Studio 2010 64-bit build. We're still far from 64b statically safe, mostly around SkReader32.h and the address-alignment code in GrTypes.h. Original code provided by jianliang79. http://code.google.com/p/skia/issues/detail?id=601 git-svn-id: http://skia.googlecode.com/svn/trunk@3994 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index eced08a..db4dbea 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp
@@ -105,7 +105,7 @@ SkASSERT(m > mm); } } - nn = SkIntToScalar(n); + nn = SkIntToScalar((unsigned int)n); mm = m; }