From ca3ebcd724b4bc5ba8c79ef6471288dc09349af7 Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Tue, 12 Dec 2017 11:22:38 -0500 Subject: fix fractured fiddles Latest run of Ravi's bot found a couple of new fiddle failures. Fix them. Yay, tools! Docs-Preview: https://skia.org/?cl=83944 Bug: skia:6898 Change-Id: I98ecef6b034363dfea88bcc9c710fb3017fc1c21 Reviewed-on: https://skia-review.googlesource.com/83944 Commit-Queue: Cary Clark Reviewed-by: Cary Clark --- docs/SkCanvas_Reference.bmh | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'docs/SkCanvas_Reference.bmh') diff --git a/docs/SkCanvas_Reference.bmh b/docs/SkCanvas_Reference.bmh index 8979b87581..2f08ca0a18 100644 --- a/docs/SkCanvas_Reference.bmh +++ b/docs/SkCanvas_Reference.bmh @@ -4874,13 +4874,14 @@ void draw(SkCanvas* canvas) { } const int xDivs[] = { center.fLeft, center.fRight }; const int yDivs[] = { center.fTop, center.fBottom }; - SkCanvas::Lattice::Flags flags[3][3]; - memset(flags, 0, sizeof(flags)); - flags[1][1] = SkCanvas::Lattice::kTransparent_Flags; - SkCanvas::Lattice lattice = { xDivs, yDivs, flags[0], SK_ARRAY_COUNT(xDivs), - SK_ARRAY_COUNT(yDivs), nullptr }; + SkCanvas::Lattice::RectType fillTypes[3][3]; + memset(fillTypes, 0, sizeof(fillTypes)); + fillTypes[1][1] = SkCanvas::Lattice::kTransparent; + SkColor dummy[9]; // temporary pending bug fix + SkCanvas::Lattice lattice = { xDivs, yDivs, fillTypes[0], SK_ARRAY_COUNT(xDivs), + SK_ARRAY_COUNT(yDivs), nullptr, dummy }; for (auto dest: { 20, 30, 40, 60, 90 } ) { - canvas->drawBitmapLattice(bitmap, lattice , SkRect::MakeWH(dest, 110 - dest), nullptr); + canvas->drawBitmapLattice(bitmap, lattice, SkRect::MakeWH(dest, 110 - dest), nullptr); canvas->translate(dest + 4, 0); } } @@ -4949,11 +4950,12 @@ void draw(SkCanvas* canvas) { } const int xDivs[] = { center.fLeft, center.fRight }; const int yDivs[] = { center.fTop, center.fBottom }; - SkCanvas::Lattice::Flags flags[3][3]; - memset(flags, 0, sizeof(flags)); - flags[1][1] = SkCanvas::Lattice::kTransparent_Flags; - SkCanvas::Lattice lattice = { xDivs, yDivs, flags[0], SK_ARRAY_COUNT(xDivs), - SK_ARRAY_COUNT(yDivs), nullptr }; + SkCanvas::Lattice::RectType fillTypes[3][3]; + memset(fillTypes, 0, sizeof(fillTypes)); + fillTypes[1][1] = SkCanvas::Lattice::kTransparent; + SkColor dummy[9]; // temporary pending bug fix + SkCanvas::Lattice lattice = { xDivs, yDivs, fillTypes[0], SK_ARRAY_COUNT(xDivs), + SK_ARRAY_COUNT(yDivs), nullptr, dummy }; sk_sp image = SkImage::MakeFromBitmap(bitmap); SkImage* imagePtr = image.get(); for (auto dest: { 20, 30, 40, 60, 90 } ) { -- cgit v1.2.3