stop using SkScalarMul
BUG=skia:
Change-Id: Ie41d8665a1c62ba8eddc93d8cfefaf64ddc52ff8
Reviewed-on: https://skia-review.googlesource.com/8411
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 81a8fe8..8b5e074 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -1305,30 +1305,30 @@
string.appendf("(%i, %i)", fMouseX, fMouseY);
SkScalar left = dest.fLeft + SkIntToScalar(3);
SkScalar i = SK_Scalar1;
- drawText(canvas, string, left, SkScalarMulAdd(lineHeight, i, dest.fTop), paint);
+ drawText(canvas, string, left, lineHeight * i + dest.fTop, paint);
// Alpha
i += SK_Scalar1;
string.reset();
string.appendf("A: %X", SkColorGetA(color));
- drawText(canvas, string, left, SkScalarMulAdd(lineHeight, i, dest.fTop), paint);
+ drawText(canvas, string, left, lineHeight * i + dest.fTop, paint);
// Red
i += SK_Scalar1;
string.reset();
string.appendf("R: %X", SkColorGetR(color));
paint.setColor(SK_ColorRED);
- drawText(canvas, string, left, SkScalarMulAdd(lineHeight, i, dest.fTop), paint);
+ drawText(canvas, string, left, lineHeight * i + dest.fTop, paint);
// Green
i += SK_Scalar1;
string.reset();
string.appendf("G: %X", SkColorGetG(color));
paint.setColor(0xFF008800);
- drawText(canvas, string, left, SkScalarMulAdd(lineHeight, i, dest.fTop), paint);
+ drawText(canvas, string, left, lineHeight * i + dest.fTop, paint);
// Blue
i += SK_Scalar1;
string.reset();
string.appendf("B: %X", SkColorGetB(color));
paint.setColor(SK_ColorBLUE);
- drawText(canvas, string, left, SkScalarMulAdd(lineHeight, i, dest.fTop), paint);
+ drawText(canvas, string, left, lineHeight * i + dest.fTop, paint);
canvas->restoreToCount(count);
}
diff --git a/samplecode/SampleClip.cpp b/samplecode/SampleClip.cpp
index 75367cc..41192fb 100644
--- a/samplecode/SampleClip.cpp
+++ b/samplecode/SampleClip.cpp
@@ -57,7 +57,7 @@
static SkScalar randRange(SkRandom& rand, SkScalar min, SkScalar max) {
SkASSERT(min <= max);
- return min + SkScalarMul(rand.nextUScalar1(), max - min);
+ return min + rand.nextUScalar1() * (max - min);
}
static void show_stroke(SkCanvas* canvas, bool doAA, SkScalar strokeWidth, int n) {
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index b105090..54de942 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -87,24 +87,18 @@
SkScalar u = SkIntToScalar(iu) / nu;
SkScalar v = SkIntToScalar(iv) / nv;
- SkScalar uv = SkScalarMul(u, v);
- SkScalar Uv = SkScalarMul(SK_Scalar1 - u, v);
- SkScalar uV = SkScalarMul(u, SK_Scalar1 - v);
- SkScalar UV = SkScalarMul(SK_Scalar1 - u, SK_Scalar1 - v);
+ SkScalar uv = u * v;
+ SkScalar Uv = (1 - u) * v;
+ SkScalar uV = u * (1 - v);
+ SkScalar UV = (1 - u) * (1 - v);
- SkScalar x0 = SkScalarMul(UV, edge[TL].fX) + SkScalarMul(uV, edge[TR].fX) +
- SkScalarMul(Uv, edge[BL].fX) + SkScalarMul(uv, edge[BR].fX);
- SkScalar y0 = SkScalarMul(UV, edge[TL].fY) + SkScalarMul(uV, edge[TR].fY) +
- SkScalarMul(Uv, edge[BL].fY) + SkScalarMul(uv, edge[BR].fY);
+ SkScalar x0 = UV * edge[TL].fX + uV * edge[TR].fX + Uv * edge[BL].fX + uv * edge[BR].fX;
+ SkScalar y0 = UV * edge[TL].fY + uV * edge[TR].fY + Uv * edge[BL].fY + uv * edge[BR].fY;
- SkScalar x = SkScalarMul(SK_Scalar1 - v, edge[TL+iu].fX) +
- SkScalarMul(u, edge[TR+iv].fX) +
- SkScalarMul(v, edge[BR+nu-iu].fX) +
- SkScalarMul(SK_Scalar1 - u, edge[BL+nv-iv].fX) - x0;
- SkScalar y = SkScalarMul(SK_Scalar1 - v, edge[TL+iu].fY) +
- SkScalarMul(u, edge[TR+iv].fY) +
- SkScalarMul(v, edge[BR+nu-iu].fY) +
- SkScalarMul(SK_Scalar1 - u, edge[BL+nv-iv].fY) - y0;
+ SkScalar x = (1 - v) * edge[TL+iu].fX + u * edge[TR+iv].fX +
+ v * edge[BR+nu-iu].fX + (1 - u) * edge[BL+nv-iv].fX - x0;
+ SkScalar y = (1 - v) * edge[TL+iu].fY + u * edge[TR+iv].fY +
+ v * edge[BR+nu-iu].fY + (1 - u) * edge[BL+nv-iv].fY - y0;
pt->set(x, y);
}
diff --git a/samplecode/SamplePathFill.cpp b/samplecode/SamplePathFill.cpp
index 2f0dc6f..fbc4c2e 100644
--- a/samplecode/SamplePathFill.cpp
+++ b/samplecode/SamplePathFill.cpp
@@ -82,7 +82,7 @@
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;