commit 6853e808a464ca75ff1328338d1eb55ff27c4337
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 16 15:50:18 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Apr 16 15:50:18 2012 +0000
tree b87b0d4374b5fd4171fd8eefe4de1c85da65c53a
parent 4f8975ea0fdd2127cc2c0611966204b36f1e75ce

Addressed more Windows compiler complaint issues

http://codereview.appspot.com/6007056/



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

samplecode/SamplePicture.cpp

diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp
index d2c9d65..7317fbe 100644
--- a/samplecode/SamplePicture.cpp
+++ b/samplecode/SamplePicture.cpp
@@ -57,7 +57,7 @@
 class PictureView : public SampleView {
     SkBitmap fBitmap;
 public:
-	PictureView() {
+        PictureView() {
         SkImageRef_GlobalPool::SetRAMBudget(16 * 1024);
 
         fBitmap = load_bitmap();
@@ -102,7 +102,7 @@
         SkPaint paint;
 
         canvas->save();
-        canvas->scale(0.5f, 0.5f);
+        canvas->scale(SkFloatToScalar(0.5f), SkFloatToScalar(0.5f));
         canvas->drawBitmap(fBitmap, 0, 0, NULL);
         canvas->restore();