diff options
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 19:44:07 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 19:44:07 +0000 |
| commit | 4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c (patch) | |
| tree | dae12c217068df2844c0ce18fb2c62311ae8c5e9 /samplecode/SampleApp.cpp | |
| parent | 2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54 (diff) | |
remove SkFloatToScalar macro
BUG=
R=reed@google.com, djsollen@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/85463005
git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index de0640e6c4..7162b7b2ad 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -658,8 +658,8 @@ static bool curr_title(SkWindow* wind, SkString* title) { void SampleWindow::setZoomCenter(float x, float y) { - fZoomCenterX = SkFloatToScalar(x); - fZoomCenterY = SkFloatToScalar(y); + fZoomCenterX = x; + fZoomCenterY = y; } bool SampleWindow::zoomIn() @@ -1549,7 +1549,7 @@ static SkBitmap::Config cycle_configs(SkBitmap::Config c) { } void SampleWindow::changeZoomLevel(float delta) { - fZoomLevel += SkFloatToScalar(delta); + fZoomLevel += delta; if (fZoomLevel > 0) { fZoomLevel = SkMinScalar(fZoomLevel, MAX_ZOOM_LEVEL); fZoomScale = fZoomLevel + SK_Scalar1; |