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/gm/shaderbounds.cpp b/gm/shaderbounds.cpp
index 9529151..ef9a7e9 100644
--- a/gm/shaderbounds.cpp
+++ b/gm/shaderbounds.cpp
@@ -41,7 +41,7 @@
virtual SkMatrix onGetInitialTransform() const SK_OVERRIDE {
SkMatrix result;
- SkScalar scale = SkFloatToScalar(0.8f);
+ SkScalar scale = 0.8f;
result.setScale(scale, scale);
result.postTranslate(SkIntToScalar(7), SkIntToScalar(23));
return result;
@@ -54,7 +54,7 @@
SkIntToScalar(240)));
SkMatrix canvasScale;
- SkScalar scale = SkFloatToScalar(0.7f);
+ SkScalar scale = 0.7f;
canvasScale.setScale(scale, scale);
canvas->concat(canvasScale);
@@ -74,9 +74,9 @@
}
SkShader* MakeShader(int width, int height, bool background) {
- SkScalar scale = SkFloatToScalar(0.5f);
+ SkScalar scale = 0.5f;
if (background) {
- scale = SkFloatToScalar(0.6f);
+ scale = 0.6f;
}
SkScalar shaderWidth = SkScalarDiv(SkIntToScalar(width), scale);
SkScalar shaderHeight = SkScalarDiv(SkIntToScalar(height), scale);