diff options
| author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-24 21:09:40 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-24 21:09:40 +0000 |
| commit | 820e80ad6390e120d4991a5280d0452ec87beaeb (patch) | |
| tree | 463440199a9e08e46baf84d704d92ee37f94394c /samplecode/SampleApp.cpp | |
| parent | 45dd1fa3cf845e46cd8f994a1cc664d4cb137131 (diff) | |
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
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 740047e534..441d2fa396 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -728,8 +728,10 @@ void SampleWindow::magnify(SkCanvas* canvas) { SkMatrix m = canvas->getTotalMatrix(); m.invert(&m); SkPoint offset, center; - m.mapXY(fMouseX - clipW/2, fMouseY - clipH/2, &offset); - m.mapXY(fMouseX, fMouseY, ¢er); + SkScalar mouseX = fMouseX * SK_Scalar1; + SkScalar mouseY = fMouseY * SK_Scalar1; + m.mapXY(mouseX - clipW/2, mouseY - clipH/2, &offset); + m.mapXY(mouseX, mouseY, ¢er); r.set(0, 0, clipW * m.getScaleX(), clipH * m.getScaleX()); r.offset(offset.fX, offset.fY); @@ -737,7 +739,7 @@ void SampleWindow::magnify(SkCanvas* canvas) { 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 @@ void SampleWindow::magnify(SkCanvas* canvas) { 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); |