commit 23c2939a4f59e8c57a88122fa430095a84797c38
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 23 15:31:43 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 23 15:31:43 2013 +0000
tree 52f175777294fa7f737488bcb36432b6a138dda9
parent eebdd966c112be5d05e4ac8e8bc0f417301b2370

Use Skia style cast in SkDeviceProperties.
(Alternative to 7329.)


git-svn-id: http://skia.googlecode.com/svn/trunk@7339 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkDeviceProperties.h

diff --git a/include/core/SkDeviceProperties.h b/include/core/SkDeviceProperties.h
index ab7dec8..2c2e952 100644
--- a/include/core/SkDeviceProperties.h
+++ b/include/core/SkDeviceProperties.h
@@ -79,12 +79,12 @@
         static Geometry MakeDefault() {
             Orientation orientation = fromOldOrientation(SkFontHost::GetSubpixelOrientation()); //kHorizontal_Orientation
             Layout layout = fromOldLayout(SkFontHost::GetSubpixelOrder()); //kRGB_Layout
-            Geometry ret = { uint8_t(orientation | layout) };
+            Geometry ret = { SkToU8(orientation | layout) };
             return ret;
         }
 
         static Geometry Make(Orientation orientation, Layout layout) {
-            Geometry ret = { uint8_t(orientation | layout) };
+            Geometry ret = { SkToU8(orientation | layout) };
             return ret;
         }