diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 21:07:05 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 21:07:05 +0000 |
| commit | 92a8916540b14549213332c5f9f0cd44ec12de75 (patch) | |
| tree | 5517a35ed975eb30f7f16e07fb528ad81d11e477 /include/core | |
| parent | b4587957f7a855234fed61a85d8e95983c271da4 (diff) | |
fix casting issue with or operator
R=reed@google.com, epoger@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/305253002
git-svn-id: http://skia.googlecode.com/svn/trunk@15011 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkCanvas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 3875c06207..6eb42d2f5a 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1514,7 +1514,7 @@ private: static inline SkCanvas::SaveFlags operator|(const SkCanvas::SaveFlags lhs, const SkCanvas::SaveFlags rhs) { - return static_cast<SkCanvas::SaveFlags>(lhs | rhs); + return static_cast<SkCanvas::SaveFlags>(static_cast<int>(lhs) | static_cast<int>(rhs)); } static inline SkCanvas::SaveFlags& operator|=(SkCanvas::SaveFlags& lhs, |