AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Speculative fix for cros_daisy compilation failure

Browse Source 
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
This commit is contained in:
robertphillips@google.com 2013-01-23 01:46:26 +00:00
parent d507775a8b
commit 5133fc73fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/core/SkDeviceProperties.h
View File

@ -79,12 +79,12 @@ struct SkDeviceProperties {
static Geometry MakeDefault() { static Geometry MakeDefault() {
Orientation orientation = fromOldOrientation(SkFontHost::GetSubpixelOrientation()); //kHorizontal_Orientation Orientation orientation = fromOldOrientation(SkFontHost::GetSubpixelOrientation()); //kHorizontal_Orientation
Layout layout = fromOldLayout(SkFontHost::GetSubpixelOrder()); //kRGB_Layout Layout layout = fromOldLayout(SkFontHost::GetSubpixelOrder()); //kRGB_Layout
Geometry ret = { orientation | layout }; Geometry ret = { uint8_t(orientation | layout) };
return ret; return ret;
} }
static Geometry Make(Orientation orientation, Layout layout) { static Geometry Make(Orientation orientation, Layout layout) {
Geometry ret = { orientation | layout }; Geometry ret = { uint8_t(orientation | layout) };
return ret; return ret;
} }