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 /src/utils/SkCamera.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 'src/utils/SkCamera.cpp')
| -rw-r--r-- | src/utils/SkCamera.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp index a7c0b1483d..f5b51d5259 100644 --- a/src/utils/SkCamera.cpp +++ b/src/utils/SkCamera.cpp @@ -365,23 +365,23 @@ void Sk3DView::restore() { #ifdef SK_BUILD_FOR_ANDROID void Sk3DView::setCameraLocation(SkScalar x, SkScalar y, SkScalar z) { // the camera location is passed in inches, set in pt - SkScalar lz = z * SkFloatToScalar(72.0f); - fCamera.fLocation.set(x * SkFloatToScalar(72.0f), y * SkFloatToScalar(72.0f), lz); + SkScalar lz = z * 72.0f; + fCamera.fLocation.set(x * 72.0f, y * 72.0f, lz); fCamera.fObserver.set(0, 0, lz); fCamera.update(); } SkScalar Sk3DView::getCameraLocationX() { - return fCamera.fLocation.fX / SkFloatToScalar(72.0f); + return fCamera.fLocation.fX / 72.0f; } SkScalar Sk3DView::getCameraLocationY() { - return fCamera.fLocation.fY / SkFloatToScalar(72.0f); + return fCamera.fLocation.fY / 72.0f; } SkScalar Sk3DView::getCameraLocationZ() { - return fCamera.fLocation.fZ / SkFloatToScalar(72.0f); + return fCamera.fLocation.fZ / 72.0f; } #endif |