From 81ecdbb7ff36afef9091c1b524baafe67381e70d Mon Sep 17 00:00:00 2001 From: Herb Derby Date: Fri, 20 Jul 2018 11:48:38 -0400 Subject: Clean up bitmap path Change-Id: If149194fd86f14bea289ad68262ea99cbbc398b6 Reviewed-on: https://skia-review.googlesource.com/142817 Reviewed-by: Ben Wagner Commit-Queue: Herb Derby --- tests/PDFPrimitivesTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp index ab34f884ab..adbfdc763c 100644 --- a/tests/PDFPrimitivesTest.cpp +++ b/tests/PDFPrimitivesTest.cpp @@ -489,12 +489,12 @@ DEF_TEST(SkPDF_Primitives_Color, reporter) { } } -static SkGlyphRun make_run(size_t len, const SkGlyphID* glyphs, const SkPoint* pos, +static SkGlyphRun make_run(size_t len, const SkGlyphID* glyphs, SkPoint* pos, SkPaint paint, const uint32_t* clusters, size_t utf8TextByteLength, const char* utf8Text) { return SkGlyphRun(std::move(paint), SkSpan{}, // No dense indices for now. - SkSpan{pos, len}, + SkSpan{pos, len}, SkSpan{glyphs, len}, SkSpan{}, SkSpan{utf8Text, utf8TextByteLength}, @@ -508,7 +508,7 @@ DEF_TEST(SkPDF_Clusterator, reporter) { constexpr unsigned len = 11; const uint32_t clusters[len] = { 3, 2, 2, 1, 0, 4, 4, 7, 6, 6, 5 }; const SkGlyphID glyphs[len] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}; - const SkPoint pos[len] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, + SkPoint pos[len] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}}; const char text[] = "abcdefgh"; SkGlyphRun run = make_run(len, glyphs, pos, paint, clusters, strlen(text), text); @@ -532,7 +532,7 @@ DEF_TEST(SkPDF_Clusterator, reporter) { constexpr unsigned len = 5; const uint32_t clusters[len] = { 0, 1, 4, 5, 6 }; const SkGlyphID glyphs[len] = { 43, 167, 79, 79, 82, }; - const SkPoint pos[len] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}}; + SkPoint pos[len] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}}; const char text[] = "Ha\xCC\x8A" "llo"; SkGlyphRun run = make_run(len, glyphs, pos, paint, clusters, strlen(text), text); SkClusterator clusterator(run); -- cgit v1.2.3