utils/SkParseColor.cpp - Issue 207443008: Fixed Skia compilation error with strict clang.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: utils/SkParseColor.cpp

Issue 207443008: Fixed Skia compilation error with strict clang. (Closed) Base URL: https://chromium.googlesource.com/external/skia/src.git@master

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: utils/SkParseColor.cpp

diff --git a/utils/SkParseColor.cpp b/utils/SkParseColor.cpp

index 26ad8b7b1cfa7ed0827b620af7123d43bd91b832..0cd10b6192a7186c8898cdf7dfc7449bb6c9875b 100644

--- a/utils/SkParseColor.cpp

+++ b/utils/SkParseColor.cpp

@@ -513,9 +513,9 @@ void SkParse::TestColor() {

size_t len = strlen(nameRGB.name);

memcpy(bad, nameRGB.name, len);

bad[len - 1] -= 1;

- SkASSERT(FindColor(bad, &result) == false);

reed1 2014/03/21 15:55:55 I think the right fix is FindColor(...) == NULL

Krzysztof Olczyk 2014/03/24 07:45:17 Done.

+ SkASSERT(FindColor(bad, &result));

bad[len - 1] += 2;

- SkASSERT(FindColor(bad, &result) == false);

+ SkASSERT(FindColor(bad, &result));

}

result = SK_ColorBLACK;

SkASSERT(FindColor("lightGrey", &result));

« no previous file with comments | « no previous file | no next file » | no next file with comments »