diff options
| author |  Hal Canary <halcanary@google.com> | 2016-11-22 12:23:28 -0700 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-22 20:14:50 +0000 |
| commit | 2cb6cb7218171b357bb5c934f032ba69c7b78401 (patch) | |
| tree | 8583d7cba64396881c8957c70769d25692f126a1 /include/core/SkEncodedImageFormat.h | |
| parent | 818d8a99e8484db29c71cc509dc1969cc786ffd1 (diff) | |
Fix bug: can't convert nullptr -> bool
Change-Id: Ib37c46d00b6a3e768e6d8399f2a6afb332d36bff
Reviewed-on: https://skia-review.googlesource.com/5141
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include/core/SkEncodedImageFormat.h')
| -rw-r--r-- | include/core/SkEncodedImageFormat.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/core/SkEncodedImageFormat.h b/include/core/SkEncodedImageFormat.h index eb714f3d42..8f79236689 100644 --- a/include/core/SkEncodedImageFormat.h +++ b/include/core/SkEncodedImageFormat.h @@ -14,6 +14,9 @@ * Enum describing format of encoded data. */ enum class SkEncodedImageFormat { +#ifdef GOOGLE3 + kUnknown, +#endif kBMP, kGIF, kICO, |