diff options
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 12 | ||||
| -rw-r--r-- | gm/colorfilterimagefilter.cpp | 2 | ||||
| -rw-r--r-- | gm/imagefiltersscaled.cpp | 2 | ||||
| -rw-r--r-- | gm/lighting.cpp | 6 | ||||
| -rw-r--r-- | gm/pathfill.cpp | 2 | ||||
| -rw-r--r-- | gm/smallpaths.cpp | 2 | ||||
| -rw-r--r-- | gm/strokefill.cpp | 2 |
7 files changed, 13 insertions, 15 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index cc28538dd0..661e7709d3 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -145,8 +145,8 @@ protected: if (!gp) { continue; } - SkScalar x = SkScalarMul(col, w); - SkScalar y = SkScalarMul(row, h); + SkScalar x = col * w; + SkScalar y = row * h; SkPoint controlPts[] = { {x + baseControlPts[0].fX, y + baseControlPts[0].fY}, {x + baseControlPts[1].fX, y + baseControlPts[1].fY}, @@ -281,8 +281,8 @@ protected: continue; } - SkScalar x = SkScalarMul(col, w); - SkScalar y = SkScalarMul(row, h); + SkScalar x = col * w; + SkScalar y = row * h; SkPoint controlPts[] = { {x + baseControlPts[0].fX, y + baseControlPts[0].fY}, {x + baseControlPts[1].fX, y + baseControlPts[1].fY}, @@ -498,8 +498,8 @@ protected: continue; } - SkScalar x = SkScalarMul(col, w); - SkScalar y = SkScalarMul(row, h); + SkScalar x = col * w; + SkScalar y = row * h; SkPoint controlPts[] = { {x + baseControlPts[0].fX, y + baseControlPts[0].fY}, {x + baseControlPts[1].fX, y + baseControlPts[1].fY}, diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp index 6e07ed3cc1..912eda12c4 100644 --- a/gm/colorfilterimagefilter.cpp +++ b/gm/colorfilterimagefilter.cpp @@ -19,7 +19,7 @@ #define MARGIN SkIntToScalar(10) static sk_sp<SkColorFilter> cf_make_brightness(float brightness) { - SkScalar amount255 = SkScalarMul(brightness, SkIntToScalar(255)); + SkScalar amount255 = brightness * 255; SkScalar matrix[20] = { 1, 0, 0, 0, amount255, 0, 1, 0, 0, amount255, diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index 756b7c624c..39d58f3724 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -28,7 +28,7 @@ static sk_sp<SkImage> make_gradient_circle(int width, int height) { SkScalar x = SkIntToScalar(width / 2); SkScalar y = SkIntToScalar(height / 2); - SkScalar radius = SkScalarMul(SkMinScalar(x, y), SkIntToScalar(4) / SkIntToScalar(5)); + SkScalar radius = SkMinScalar(x, y) * 4 / 5; sk_sp<SkSurface> surface(SkSurface::MakeRasterN32Premul(width, height)); SkCanvas* canvas = surface->getCanvas(); canvas->clear(0x00000000); diff --git a/gm/lighting.cpp b/gm/lighting.cpp index cd4132e1b5..97c6f52fef 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -73,10 +73,8 @@ protected: SkIntToScalar(10)); SkScalar elevationRad = SkDegreesToRadians(SkIntToScalar(5)); - SkPoint3 distantDirection = SkPoint3::Make(SkScalarMul(cosAzimuth, - SkScalarCos(elevationRad)), - SkScalarMul(sinAzimuth, - SkScalarCos(elevationRad)), + SkPoint3 distantDirection = SkPoint3::Make(cosAzimuth * SkScalarCos(elevationRad), + sinAzimuth * SkScalarCos(elevationRad), SkScalarSin(elevationRad)); SkScalar cutoffAngle = SkIntToScalar(15); SkScalar kd = SkIntToScalar(2); diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp index 2562e7c9a5..de762a9548 100644 --- a/gm/pathfill.cpp +++ b/gm/pathfill.cpp @@ -119,7 +119,7 @@ static SkScalar make_star(SkPath* path, int n) { for (int i = 1; i < n; i++) { rad += drad; SkScalar cosV, sinV = SkScalarSinCos(rad, &cosV); - path->lineTo(c + SkScalarMul(cosV, r), c + SkScalarMul(sinV, r)); + path->lineTo(c + cosV * r, c + sinV * r); } path->close(); return r * 2 * 6 / 5; diff --git a/gm/smallpaths.cpp b/gm/smallpaths.cpp index ddbb60dcfd..b6a3b33cdc 100644 --- a/gm/smallpaths.cpp +++ b/gm/smallpaths.cpp @@ -49,7 +49,7 @@ static SkScalar make_star(SkPath* path, int n) { for (int i = 1; i < n; i++) { rad += drad; SkScalar cosV, sinV = SkScalarSinCos(rad, &cosV); - path->lineTo(c + SkScalarMul(cosV, r), c + SkScalarMul(sinV, r)); + path->lineTo(c + cosV * r, c + sinV * r); } path->close(); return r * 2 * 6 / 5; diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp index 98e9bbb868..3e81107e2a 100644 --- a/gm/strokefill.cpp +++ b/gm/strokefill.cpp @@ -241,7 +241,7 @@ static void path_bold(SkCanvas* canvas, const SkPath& path, const SkPaint& paint SkScalar fakeBoldScale = SkScalarInterpFunc(p.getTextSize(), kStdFakeBoldInterpKeys, kStdFakeBoldInterpValues, kStdFakeBoldInterpLength); - SkScalar extra = SkScalarMul(p.getTextSize(), fakeBoldScale); + SkScalar extra = p.getTextSize() * fakeBoldScale; p.setStrokeWidth(extra); canvas->save(); canvas->translate(0, 120); |