From 44e91c9638e7e31966d304635682e819cd9e440a Mon Sep 17 00:00:00 2001 From: James Zern Date: Wed, 9 Nov 2016 19:22:46 -0800 Subject: LinearGradientContext::shade4_clamp: fix div by 0 getScaleX() may return 0; move division using it after a SkScalarNearlyZero check and closer to its first use. Change-Id: Ie209d46dc101213e20e90486651ee17570425bb8 Reviewed-on: https://skia-review.googlesource.com/4643 Reviewed-by: Florin Malita Commit-Queue: Florin Malita --- tests/GradientTest.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'tests/GradientTest.cpp') diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp index ee776e3651..50643f1fe2 100644 --- a/tests/GradientTest.cpp +++ b/tests/GradientTest.cpp @@ -279,6 +279,18 @@ static void test_nearly_vertical(skiatest::Reporter* reporter) { surface->getCanvas()->drawPaint(paint); } +static void test_vertical(skiatest::Reporter* reporter) { + auto surface(SkSurface::MakeRasterN32Premul(200, 200)); + + const SkPoint pts[] = {{ 100, 50 }, { 100, 50 }}; + const SkColor colors[] = { SK_ColorBLACK, SK_ColorWHITE }; + const SkScalar pos[] = { 0, 1 }; + SkPaint paint; + paint.setShader(SkGradientShader::MakeLinear(pts, colors, pos, 2, SkShader::kClamp_TileMode)); + + surface->getCanvas()->drawPaint(paint); +} + // A linear gradient interval can, due to numerical imprecision (likely in the divide) // finish an interval with the final fx not landing outside of [p0...p1]. // The old code had an assert which this test triggered. @@ -359,6 +371,7 @@ DEF_TEST(Gradient, reporter) { TestConstantGradient(reporter); test_big_grad(reporter); test_nearly_vertical(reporter); + test_vertical(reporter); test_linear_fuzz(reporter); test_two_point_conical_zero_radius(reporter); test_clamping_overflow(reporter); -- cgit v1.2.3