diff options
Diffstat (limited to 'src/gpu/ops/GrAAConvexPathRenderer.cpp')
-rw-r--r-- | src/gpu/ops/GrAAConvexPathRenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/ops/GrAAConvexPathRenderer.cpp b/src/gpu/ops/GrAAConvexPathRenderer.cpp index d2397329ea..5d0970648a 100644 --- a/src/gpu/ops/GrAAConvexPathRenderer.cpp +++ b/src/gpu/ops/GrAAConvexPathRenderer.cpp @@ -183,7 +183,7 @@ struct DegenerateTestData { }; static const SkScalar kClose = (SK_Scalar1 / 16); -static const SkScalar kCloseSqd = SkScalarMul(kClose, kClose); +static const SkScalar kCloseSqd = kClose * kClose; static void update_degenerate_test(DegenerateTestData* data, const SkPoint& pt) { switch (data->fStage) { @@ -218,8 +218,8 @@ static inline bool get_direction(const SkPath& path, const SkMatrix& m, } // check whether m reverses the orientation SkASSERT(!m.hasPerspective()); - SkScalar det2x2 = SkScalarMul(m.get(SkMatrix::kMScaleX), m.get(SkMatrix::kMScaleY)) - - SkScalarMul(m.get(SkMatrix::kMSkewX), m.get(SkMatrix::kMSkewY)); + SkScalar det2x2 = m.get(SkMatrix::kMScaleX) * m.get(SkMatrix::kMScaleY) - + m.get(SkMatrix::kMSkewX) * m.get(SkMatrix::kMSkewY); if (det2x2 < 0) { *dir = SkPathPriv::OppositeFirstDirection(*dir); } |