AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix -Wstring-concatenation warnings in clang 12

Browse Source 
Change-Id: Ic09346b6079e6f316c28e03ddb02f12b4af8a38d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/312482
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2020-08-21 12:39:33 -04:00 committed by Skia Commit-Bot
parent 5cca20c580
commit 7a492f786d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CodecTest.cpp
View File

@ -270,7 +270,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"
};

8
tests/PDFDocumentTest.cpp
View File

@ -209,10 +209,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)) {

8
tests/PathTest.cpp
View File

@ -5105,10 +5105,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;