commit 820e80ad6390e120d4991a5280d0452ec87beaeb
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 24 21:09:40 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Oct 24 21:09:40 2011 +0000
tree 463440199a9e08e46baf84d704d92ee37f94394c
parent 45dd1fa3cf845e46cd8f994a1cc664d4cb137131

Fix some warnings on VS2010 
Review URL: http://codereview.appspot.com/5312051/



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

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 740047e..441d2fa 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -728,8 +728,10 @@
     SkMatrix m = canvas->getTotalMatrix();
     m.invert(&m);
     SkPoint offset, center;
-    m.mapXY(fMouseX - clipW/2, fMouseY - clipH/2, &offset);
-    m.mapXY(fMouseX, fMouseY, &center);
+    SkScalar mouseX = fMouseX * SK_Scalar1;
+    SkScalar mouseY = fMouseY * SK_Scalar1;
+    m.mapXY(mouseX - clipW/2, mouseY - clipH/2, &offset);
+    m.mapXY(mouseX, mouseY, &center);
     
     r.set(0, 0, clipW * m.getScaleX(), clipH * m.getScaleX());
     r.offset(offset.fX, offset.fY);
@@ -737,7 +739,7 @@
     SkPaint paint;
     paint.setColor(0xFF66AAEE);
     paint.setStyle(SkPaint::kStroke_Style);
-    paint.setStrokeWidth(10.0 * m.getScaleX());
+    paint.setStrokeWidth(10.f * m.getScaleX());
     //lense offset
     //canvas->translate(0, -250);
     canvas->drawRect(r, paint);
@@ -745,7 +747,7 @@
     
     m = canvas->getTotalMatrix();
     m.setTranslate(-center.fX, -center.fY);
-    m.postScale(0.5 * fFatBitsScale, 0.5 * fFatBitsScale);
+    m.postScale(0.5f * fFatBitsScale, 0.5f * fFatBitsScale);
     m.postTranslate(center.fX, center.fY);
     canvas->concat(m);