aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-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));