diff options
| author | Brian Salomon <bsalomon@google.com> | 2021-12-16 10:00:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-16 10:00:42 +0000 |
| commit | b583dd232f7acf4d2c275d3ea9b2b76a913d1e03 (patch) | |
| tree | 2b1dc885c6294be1650dec0bc9d69428a931a71c | |
| parent | 81c069525ee8c577ddd32990837584a3341ee737 (diff) | |
| parent | 94ed3ab33dd02c4f212ab514ddcb59810b2c5a4a (diff) | |
| download | skqp-b583dd232f7acf4d2c275d3ea9b2b76a913d1e03.tar.gz | |
[BACKPORT] Fix -Wstring-concatenation warnings in clang 12 am: 94ed3ab33d
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1924038
Change-Id: I7d1633b440262d97bebb06ce7f7dc4436733491a
| -rw-r--r-- | tests/CodecTest.cpp | 2 | ||||
| -rw-r--r-- | tests/PDFDocumentTest.cpp | 8 | ||||
| -rw-r--r-- | tests/PathTest.cpp | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp index 8c918a8395..3ce239ee8c 100644 --- a/tests/CodecTest.cpp +++ b/tests/CodecTest.cpp @@ -265,7 +265,7 @@ static void test_codec(skiatest::Reporter* r, const char* path, Codec* codec, Sk static bool supports_partial_scanlines(const char path[]) { static const char* const exts[] = { - "jpg", "jpeg", "png", "webp" + "jpg", "jpeg", "png", "webp", "JPG", "JPEG", "PNG", "WEBP" }; diff --git a/tests/PDFDocumentTest.cpp b/tests/PDFDocumentTest.cpp index 95821e8eb4..0d8e0a207f 100644 --- a/tests/PDFDocumentTest.cpp +++ b/tests/PDFDocumentTest.cpp @@ -211,10 +211,10 @@ DEF_TEST(SkPDF_unicode_metadata, r) { } sk_sp<SkData> data(wStream.detachAsData()); static const char* expectations[] = { - "<</Title <FEFFD835DCD0D835DCD1D835DCD2D835DCD3D835DCD40020" - "D835DCD5D835DCD6D835DCD7D835DCD8D835DCD9>", - "/Author (ABCDE FGHIJ)", - "Subject <FEFF03B103B203B303B403B5002003B603B703B803B903BA>", + ("<</Title <FEFFD835DCD0D835DCD1D835DCD2D835DCD3D835DCD40020" + "D835DCD5D835DCD6D835DCD7D835DCD8D835DCD9>"), + "/Author (ABCDE FGHIJ)", + "Subject <FEFF03B103B203B303B403B5002003B603B703B803B903BA>", }; for (const char* expectation : expectations) { if (!contains(data->bytes(), data->size(), expectation)) { diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index 0668098602..f03dd55103 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -4911,10 +4911,10 @@ DEF_TEST(NonFinitePathIteration, reporter) { DEF_TEST(AndroidArc, reporter) { const char* tests[] = { - "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z", - "M50,0L92,0 A8,8,0,0 1 100,8 L100,92 A8,8,0,0 1 92,100 L8,100" - " A8,8,0,0 1 0,92 L 0,8 A8,8,0,0 1 8,0z", - "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" + "M50,0A50,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z", + ("M50,0L92,0 A8,8,0,0 1 100,8 L100,92 A8,8,0,0 1 92,100 L8,100" + " A8,8,0,0 1 0,92 L 0,8 A8,8,0,0 1 8,0z"), + "M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0" }; for (auto test : tests) { SkPath aPath; |