aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-07 13:12:47 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-07 13:12:47 +0000
commitb7fedac2d1e4c4d1d74056afd2d50587d5ea61ed (patch)
tree09831d916a61043bb5e5e1571ad40e56b4c2c893
parent0f8c859fb8ff5b4b361f9858fe0efd262ce11e2b (diff)
Fixed Skia compilation error with strict clang.
BUG=skia: R=reed@google.com, sergeyberezin@chromium.org, hcm@google.com Author: kolczyk@opera.com Review URL: https://codereview.chromium.org/227043006 git-svn-id: http://skia.googlecode.com/svn/trunk@14071 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--AUTHORS1
-rw-r--r--src/utils/SkParseColor.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index df3b81ad63..84a769e119 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,7 @@ Igalia <*@igalia.com>
Intel <*@intel.com>
Jacek Caban <cjacek@gmail.com>
NVIDIA <*@nvidia.com>
+Opera Software ASA <*@opera.com>
Samsung <*@samsung.com>
Skia Buildbots <skia.buildbots@gmail.com>
Steve Singer <steve@ssinger.info>
diff --git a/src/utils/SkParseColor.cpp b/src/utils/SkParseColor.cpp
index 26ad8b7b1c..989a6091ef 100644
--- a/src/utils/SkParseColor.cpp
+++ b/src/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);
+ SkASSERT(FindColor(bad, &result) == NULL);
bad[len - 1] += 2;
- SkASSERT(FindColor(bad, &result) == false);
+ SkASSERT(FindColor(bad, &result) == NULL);
}
result = SK_ColorBLACK;
SkASSERT(FindColor("lightGrey", &result));