From 5133fc73fec8915561bd4eb7c60abac9be6e8f8d Mon Sep 17 00:00:00 2001 From: "robertphillips@google.com" Date: Wed, 23 Jan 2013 01:46:26 +0000 Subject: [PATCH] Speculative fix for cros_daisy compilation failure include/core/SkDeviceProperties.h:82:51: error: narrowing conversion of '(((int)orientation) | ((int)layout))' from 'int' to 'uint8_t unreviewed git-svn-id: http://skia.googlecode.com/svn/trunk@7329 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkDeviceProperties.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/core/SkDeviceProperties.h b/include/core/SkDeviceProperties.h index 098c925124..ab7dec8f8d 100644 --- a/include/core/SkDeviceProperties.h +++ b/include/core/SkDeviceProperties.h @@ -79,12 +79,12 @@ struct SkDeviceProperties { static Geometry MakeDefault() { Orientation orientation = fromOldOrientation(SkFontHost::GetSubpixelOrientation()); //kHorizontal_Orientation Layout layout = fromOldLayout(SkFontHost::GetSubpixelOrder()); //kRGB_Layout - Geometry ret = { orientation | layout }; + Geometry ret = { uint8_t(orientation | layout) }; return ret; } static Geometry Make(Orientation orientation, Layout layout) { - Geometry ret = { orientation | layout }; + Geometry ret = { uint8_t(orientation | layout) }; return ret; }