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/blurrect.cpp b/gm/blurrect.cpp
index 5e31a1c..6b50fe1 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -309,8 +309,8 @@
DEF_GM(return new BlurRectGM("blurrect", NULL, 0xFF, SkBlurMaskFilter::kOuter_BlurStyle);)
DEF_GM(return new BlurRectGM("blurrect", NULL, 0xFF, SkBlurMaskFilter::kInner_BlurStyle);)
-static const SkScalar kBig = SkFloatToScalar(20);
-static const SkScalar kSmall = SkFloatToScalar(2);
+static const SkScalar kBig = 20;
+static const SkScalar kSmall = 2;
// regular size rects, blurs should be small enough not to completely overlap.
diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp
index f5a7d21..6a466c9 100644
--- a/gm/blurroundrect.cpp
+++ b/gm/blurroundrect.cpp
@@ -111,7 +111,7 @@
}
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
- canvas->scale(SkFloatToScalar(1.5f), SkFloatToScalar(1.5f));
+ canvas->scale(1.5f, 1.5f);
const int blurRadii[] = { 1, 3, 6, 10 };
const int cornerRadii[] = { 1, 3, 6, 10 };
diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp
index 6323d33..3227dfb 100644
--- a/gm/colorfilterimagefilter.cpp
+++ b/gm/colorfilterimagefilter.cpp
@@ -23,7 +23,7 @@
}
static SkImageFilter* make_brightness(float amount, SkImageFilter* input = NULL) {
- SkScalar amount255 = SkScalarMul(SkFloatToScalar(amount), SkIntToScalar(255));
+ SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255));
SkScalar matrix[20] = { 1, 0, 0, 0, amount255,
0, 1, 0, 0, amount255,
0, 0, 1, 0, amount255,
@@ -35,10 +35,10 @@
static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) {
SkScalar matrix[20];
memset(matrix, 0, 20 * sizeof(SkScalar));
- matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f);
- matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f);
- matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f);
- matrix[18] = SkFloatToScalar(1.0f);
+ matrix[0] = matrix[5] = matrix[10] = 0.2126f;
+ matrix[1] = matrix[6] = matrix[11] = 0.7152f;
+ matrix[2] = matrix[7] = matrix[12] = 0.0722f;
+ matrix[18] = 1.0f;
SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix));
return SkColorFilterImageFilter::Create(filter, input);
}
@@ -62,7 +62,7 @@
void drawClippedRect(SkCanvas* canvas, const SkRect& r, const SkPaint& paint, float outset = 0.0f) {
canvas->save();
SkRect clip(r);
- clip.outset(SkFloatToScalar(outset), SkFloatToScalar(outset));
+ clip.outset(outset, outset);
canvas->clipRect(clip);
canvas->drawRect(r, paint);
canvas->restore();
diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp
index 16086f0..9ab6563 100644
--- a/gm/colormatrix.cpp
+++ b/gm/colormatrix.cpp
@@ -122,19 +122,19 @@
setColorMatrix(&paint, matrix);
canvas->drawBitmap(bmps[i], 240, 0, &paint);
- matrix.setSaturation(SkFloatToScalar(0.0f));
+ matrix.setSaturation(0.0f);
setColorMatrix(&paint, matrix);
canvas->drawBitmap(bmps[i], 0, 80, &paint);
- matrix.setSaturation(SkFloatToScalar(0.5f));
+ matrix.setSaturation(0.5f);
setColorMatrix(&paint, matrix);
canvas->drawBitmap(bmps[i], 80, 80, &paint);
- matrix.setSaturation(SkFloatToScalar(1.0f));
+ matrix.setSaturation(1.0f);
setColorMatrix(&paint, matrix);
canvas->drawBitmap(bmps[i], 160, 80, &paint);
- matrix.setSaturation(SkFloatToScalar(2.0f));
+ matrix.setSaturation(2.0f);
setColorMatrix(&paint, matrix);
canvas->drawBitmap(bmps[i], 240, 80, &paint);
diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index 86386b3..8ff1dfa 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -100,10 +100,10 @@
// device boundaries so we need to "undo" the effect of the
// scale and translate
SkRect bounds = SkRect::MakeLTRB(
- SkFloatToScalar(4.0f/3.0f * -20),
- SkFloatToScalar(4.0f/3.0f * -20),
- SkFloatToScalar(4.0f/3.0f * (this->getISize().fWidth - 20)),
- SkFloatToScalar(4.0f/3.0f * (this->getISize().fHeight - 20)));
+ 4.0f/3.0f * -20,
+ 4.0f/3.0f * -20,
+ 4.0f/3.0f * (this->getISize().fWidth - 20),
+ 4.0f/3.0f * (this->getISize().fHeight - 20));
bounds.inset(SkIntToScalar(100), SkIntToScalar(100));
SkPaint boundPaint;
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index f936ab1..0e8e0bc 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -21,19 +21,19 @@
this->setBGColor(SkColorSetRGB(0xDD,0xA0,0xDD));
// offset the rects a bit so we get antialiasing even in the rect case
- SkScalar xA = SkFloatToScalar(0.65f);
- SkScalar xB = SkFloatToScalar(10.65f);
- SkScalar xC = SkFloatToScalar(20.65f);
- SkScalar xD = SkFloatToScalar(30.65f);
- SkScalar xE = SkFloatToScalar(40.65f);
- SkScalar xF = SkFloatToScalar(50.65f);
+ SkScalar xA = 0.65f;
+ SkScalar xB = 10.65f;
+ SkScalar xC = 20.65f;
+ SkScalar xD = 30.65f;
+ SkScalar xE = 40.65f;
+ SkScalar xF = 50.65f;
- SkScalar yA = SkFloatToScalar(0.65f);
- SkScalar yB = SkFloatToScalar(10.65f);
- SkScalar yC = SkFloatToScalar(20.65f);
- SkScalar yD = SkFloatToScalar(30.65f);
- SkScalar yE = SkFloatToScalar(40.65f);
- SkScalar yF = SkFloatToScalar(50.65f);
+ SkScalar yA = 0.65f;
+ SkScalar yB = 10.65f;
+ SkScalar yC = 20.65f;
+ SkScalar yD = 30.65f;
+ SkScalar yE = 40.65f;
+ SkScalar yF = 50.65f;
fWidth = xF - xA;
fHeight = yF - yA;
diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp
index b1b2696..8eb4cba 100644
--- a/gm/convexpaths.cpp
+++ b/gm/convexpaths.cpp
@@ -176,11 +176,11 @@
30 * SK_Scalar1, 0);
// triangle where one edge is a degenerate quad
- fPaths.push_back().moveTo(SkFloatToScalar(8.59375f), 45 * SK_Scalar1);
- fPaths.back().quadTo(SkFloatToScalar(16.9921875f), 45 * SK_Scalar1,
- SkFloatToScalar(31.25f), 45 * SK_Scalar1);
+ fPaths.push_back().moveTo(8.59375f, 45 * SK_Scalar1);
+ fPaths.back().quadTo(16.9921875f, 45 * SK_Scalar1,
+ 31.25f, 45 * SK_Scalar1);
fPaths.back().lineTo(100 * SK_Scalar1, 100 * SK_Scalar1);
- fPaths.back().lineTo(SkFloatToScalar(8.59375f), 45 * SK_Scalar1);
+ fPaths.back().lineTo(8.59375f, 45 * SK_Scalar1);
// triangle where one edge is a quad with a repeated point
fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
@@ -197,14 +197,14 @@
// triangle where one edge is a quad with a nearly repeated point
fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
fPaths.back().lineTo(50 * SK_Scalar1, 0);
- fPaths.back().quadTo(50 * SK_Scalar1, SkFloatToScalar(49.95f),
+ fPaths.back().quadTo(50 * SK_Scalar1, 49.95f,
50 * SK_Scalar1, 50 * SK_Scalar1);
// triangle where one edge is a cubic with a 3x nearly repeated point
fPaths.push_back().moveTo(0, 25 * SK_Scalar1);
fPaths.back().lineTo(50 * SK_Scalar1, 0);
- fPaths.back().cubicTo(50 * SK_Scalar1, SkFloatToScalar(49.95f),
- 50 * SK_Scalar1, SkFloatToScalar(49.97f),
+ fPaths.back().cubicTo(50 * SK_Scalar1, 49.95f,
+ 50 * SK_Scalar1, 49.97f,
50 * SK_Scalar1, 50 * SK_Scalar1);
// triangle where there is a point degenerate cubic at one corner
@@ -253,7 +253,7 @@
// small circle. This is listed last so that it has device coords far
// from the origin (small area relative to x,y values).
- fPaths.push_back().addCircle(0, 0, SkFloatToScalar(1.2f));
+ fPaths.push_back().addCircle(0, 0, 1.2f);
}
virtual void onDraw(SkCanvas* canvas) {
diff --git a/gm/dashing.cpp b/gm/dashing.cpp
index bbd0b65..fa88e9e 100644
--- a/gm/dashing.cpp
+++ b/gm/dashing.cpp
@@ -263,7 +263,7 @@
// 1on/1off 3x3 squares with phase of 1.5 - rects fast path
canvas->save();
canvas->translate(112, 110);
- this->drawDashedLines(canvas, 100, SkFloatToScalar(1.5f), SkIntToScalar(3), 3, false);
+ this->drawDashedLines(canvas, 100, 1.5f, SkIntToScalar(3), 3, false);
canvas->restore();
// 1on/1off 1x1 circles with phase of 1 - no fast path yet
diff --git a/gm/gradient_matrix.cpp b/gm/gradient_matrix.cpp
index 508b3eb..d1d0e42 100644
--- a/gm/gradient_matrix.cpp
+++ b/gm/gradient_matrix.cpp
@@ -24,7 +24,7 @@
};
// These annoying defines are necessary, because the only other alternative
-// is to use SkIntToScalar(...) or SkFloatToScalar(...) everywhere.
+// is to use SkIntToScalar(...) everywhere.
static const SkScalar sZero = 0;
static const SkScalar sHalf = SK_ScalarHalf;
static const SkScalar sOne = SK_Scalar1;
diff --git a/gm/gradients.cpp b/gm/gradients.cpp
index 8208d62..d4617bc 100644
--- a/gm/gradients.cpp
+++ b/gm/gradients.cpp
@@ -262,7 +262,7 @@
this->drawBG(canvas);
SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorGREEN, SK_ColorRED };
- SkScalar pos[] = { 0, SkFloatToScalar(0.01f), SkFloatToScalar(0.99f), SK_Scalar1 };
+ SkScalar pos[] = { 0, 0.01f, 0.99f, SK_Scalar1 };
SkPoint c0;
c0.iset(-80, 25);
SkScalar r0 = SkIntToScalar(70);
@@ -343,9 +343,9 @@
center.set(SkIntToScalar(dim.width())/2, SkIntToScalar(dim.height())/2);
SkScalar radius = SkIntToScalar(dim.width())/2;
const SkColor colors[] = { 0x7f7f7f7f, 0x7f7f7f7f, 0xb2000000 };
- const SkScalar pos[] = { SkFloatToScalar(0.0f),
- SkFloatToScalar(0.35f),
- SkFloatToScalar(1.0f) };
+ const SkScalar pos[] = { 0.0f,
+ 0.35f,
+ 1.0f };
SkShader* shader =
SkGradientShader::CreateRadial(center, radius, colors,
pos, SK_ARRAY_COUNT(pos),
diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp
index d0f141b..fb99d23 100644
--- a/gm/hairlines.cpp
+++ b/gm/hairlines.cpp
@@ -95,13 +95,13 @@
{
SkPath* problem2 = &fPaths.push_back();
problem2->moveTo(SkIntToScalar(5), SkIntToScalar(1));
- problem2->lineTo(SkFloatToScalar(4.32787323f), SkFloatToScalar(1.67212653f));
- problem2->cubicTo(SkFloatToScalar(2.75223875f), SkFloatToScalar(3.24776125f),
- SkFloatToScalar(3.00581908f), SkFloatToScalar(4.51236057f),
- SkFloatToScalar(3.7580452f), SkFloatToScalar(4.37367964f));
- problem2->cubicTo(SkFloatToScalar(4.66472578f), SkFloatToScalar(3.888381f),
- SkFloatToScalar(5.f), SkFloatToScalar(2.875f),
- SkFloatToScalar(5.f), SkFloatToScalar(1.f));
+ problem2->lineTo(4.32787323f, 1.67212653f);
+ problem2->cubicTo(2.75223875f, 3.24776125f,
+ 3.00581908f, 4.51236057f,
+ 3.7580452f, 4.37367964f);
+ problem2->cubicTo(4.66472578f, 3.888381f,
+ 5.f, 2.875f,
+ 5.f, 1.f);
problem2->close();
}
@@ -137,8 +137,8 @@
{
// Arc example to test imperfect truncation bug (crbug.com/295626)
static const SkScalar kRad = SkIntToScalar(2000);
- static const SkScalar kStartAngle = SkFloatToScalar(262.59717f);
- static const SkScalar kSweepAngle = SkScalarHalf(SkFloatToScalar(17.188717f));
+ static const SkScalar kStartAngle = 262.59717f;
+ static const SkScalar kSweepAngle = SkScalarHalf(17.188717f);
SkPath* bug = &fPaths.push_back();
diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp
index 4e46869..3de0799 100644
--- a/gm/imagefiltersgraph.cpp
+++ b/gm/imagefiltersgraph.cpp
@@ -140,7 +140,7 @@
SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0,
0, SK_Scalar1, 0, 0, 0,
0, 0, SK_Scalar1, 0, 0,
- 0, 0, 0, SkFloatToScalar(0.5f), 0 };
+ 0, 0, 0, 0.5f, 0 };
SkAutoTUnref<SkColorFilter> matrixFilter(new SkColorMatrixFilter(matrix));
SkAutoTUnref<SkImageFilter> colorMorph(SkColorFilterImageFilter::Create(matrixFilter, morph));
@@ -156,7 +156,7 @@
SkScalar matrix[20] = { SK_Scalar1, 0, 0, 0, 0,
0, SK_Scalar1, 0, 0, 0,
0, 0, SK_Scalar1, 0, 0,
- 0, 0, 0, SkFloatToScalar(0.5f), 0 };
+ 0, 0, 0, 0.5f, 0 };
SkColorMatrixFilter matrixCF(matrix);
SkAutoTUnref<SkImageFilter> matrixFilter(SkColorFilterImageFilter::Create(&matrixCF));
SimpleOffsetFilter offsetFilter(SkIntToScalar(10), SkIntToScalar(10), matrixFilter);
diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp
index 1863a7f..932d997 100644
--- a/gm/matrixconvolution.cpp
+++ b/gm/matrixconvolution.cpp
@@ -56,7 +56,7 @@
SkIntToScalar( 1), SkIntToScalar( 1), SkIntToScalar( 1),
};
SkISize kernelSize = SkISize::Make(3, 3);
- SkScalar gain = SkFloatToScalar(0.3f), bias = SkIntToScalar(100);
+ SkScalar gain = 0.3f, bias = SkIntToScalar(100);
SkPaint paint;
SkAutoTUnref<SkImageFilter> filter(
SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize,
diff --git a/gm/ovals.cpp b/gm/ovals.cpp
index 96e0488..53ccb16 100755
--- a/gm/ovals.cpp
+++ b/gm/ovals.cpp
@@ -127,9 +127,9 @@
SkColor genColor(SkRandom* rand) {
SkScalar hsv[3];
- hsv[0] = SkFloatToScalar(rand->nextRangeF(0.0f, 360.0f));
- hsv[1] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
- hsv[2] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
+ hsv[0] = rand->nextRangeF(0.0f, 360.0f);
+ hsv[1] = rand->nextRangeF(0.75f, 1.0f);
+ hsv[2] = rand->nextRangeF(0.75f, 1.0f);
return SkHSVToColor(hsv);
}
diff --git a/gm/perlinnoise.cpp b/gm/perlinnoise.cpp
index 098c690..164c021 100644
--- a/gm/perlinnoise.cpp
+++ b/gm/perlinnoise.cpp
@@ -72,7 +72,7 @@
test(canvas, 100, 300, SkPerlinNoiseShader::kFractalNoise_Type,
0.1f, 0.1f, 3, 4, false);
- canvas->scale(SkFloatToScalar(0.75f), SkFloatToScalar(1.0f));
+ canvas->scale(0.75f, 1.0f);
test(canvas, 0, 400, SkPerlinNoiseShader::kFractalNoise_Type,
0.1f, 0.1f, 2, 0, false);
diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp
index 3f1c49e..7f5b9ea 100644
--- a/gm/roundrects.cpp
+++ b/gm/roundrects.cpp
@@ -128,9 +128,9 @@
SkColor genColor(SkRandom* rand) {
SkScalar hsv[3];
- hsv[0] = SkFloatToScalar(rand->nextRangeF(0.0f, 360.0f));
- hsv[1] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
- hsv[2] = SkFloatToScalar(rand->nextRangeF(0.75f, 1.0f));
+ hsv[0] = rand->nextRangeF(0.0f, 360.0f);
+ hsv[1] = rand->nextRangeF(0.75f, 1.0f);
+ hsv[2] = rand->nextRangeF(0.75f, 1.0f);
return SkHSVToColor(hsv);
}
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);
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp
index 885226b..e8946b4 100644
--- a/gm/simpleaaclip.cpp
+++ b/gm/simpleaaclip.cpp
@@ -53,10 +53,10 @@
: fGeomType(geomType) {
// offset the rects a bit so we get anti-aliasing in the rect case
- fBase.set(SkFloatToScalar(100.65f),
- SkFloatToScalar(100.65f),
- SkFloatToScalar(150.65f),
- SkFloatToScalar(150.65f));
+ fBase.set(100.65f,
+ 100.65f,
+ 150.65f,
+ 150.65f);
fRect = fBase;
fRect.inset(5, 5);
fRect.offset(25, 25);