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
diff --git a/src/views/SkTouchGesture.cpp b/src/views/SkTouchGesture.cpp
index 3becccd..9b02417 100644
--- a/src/views/SkTouchGesture.cpp
+++ b/src/views/SkTouchGesture.cpp
@@ -50,7 +50,7 @@
void SkFlingState::reset(float sx, float sy) {
fActive = true;
- fDirection.set(SkFloatToScalar(sx), SkFloatToScalar(sy));
+ fDirection.set(sx, sy);
fSpeed0 = SkPoint::Normalize(&fDirection);
fSpeed0 = pin_max_fling(fSpeed0);
fTime0 = getseconds();
@@ -82,7 +82,7 @@
tx = (float)sk_float_round2int(tx);
ty = (float)sk_float_round2int(ty);
}
- matrix->setTranslate(SkFloatToScalar(tx), SkFloatToScalar(ty));
+ matrix->setTranslate(tx, ty);
// printf("---- evaluate (%g %g)\n", tx, ty);
return true;
@@ -182,7 +182,7 @@
}
static SkScalar center(float pos0, float pos1) {
- return SkFloatToScalar((pos0 + pos1) * 0.5f);
+ return (pos0 + pos1) * 0.5f;
}
static const float MAX_ZOOM_SCALE = 4;