From b7fedac2d1e4c4d1d74056afd2d50587d5ea61ed Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 7 Apr 2014 13:12:47 +0000 Subject: [PATCH] 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 --- AUTHORS | 1 + src/utils/SkParseColor.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index df3b81a..84a769e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -19,6 +19,7 @@ Igalia <*@igalia.com> Intel <*@intel.com> Jacek Caban NVIDIA <*@nvidia.com> +Opera Software ASA <*@opera.com> Samsung <*@samsung.com> Skia Buildbots Steve Singer diff --git a/src/utils/SkParseColor.cpp b/src/utils/SkParseColor.cpp index 26ad8b7..989a609 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)); -- 2.7.4