From 92a8916540b14549213332c5f9f0cd44ec12de75 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 30 May 2014 21:07:05 +0000 Subject: 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 --- include/core/SkCanvas.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/core') 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(lhs | rhs); + return static_cast(static_cast(lhs) | static_cast(rhs)); } static inline SkCanvas::SaveFlags& operator|=(SkCanvas::SaveFlags& lhs, -- cgit v1.2.3