diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-27 21:47:03 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-27 21:47:03 +0000 |
| commit | 72e49b8982586a5d8b0425f16d909c05a36ea8c3 (patch) | |
| tree | fd08e38dad34154b060d34aa6cded73e97d17b75 /include/utils | |
| parent | c5507bfe2d54e411ef6eb83452b8cbfbae009610 (diff) | |
warning fixes
Review URL http://codereview.appspot.com/5328050/
git-svn-id: http://skia.googlecode.com/svn/trunk@2548 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/utils')
| -rw-r--r-- | include/utils/SkMatrix44.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/utils/SkMatrix44.h b/include/utils/SkMatrix44.h index 58d063a491..93140b022d 100644 --- a/include/utils/SkMatrix44.h +++ b/include/utils/SkMatrix44.h @@ -46,6 +46,20 @@ static const SkMScalar SK_MScalarPI = 3.14159265f; #endif +#ifdef SK_SCALAR_IS_FLOAT + #define SkMScalarToScalar SkMScalarToFloat + #define SkScalarToMScalar SkFloatToMScalar +#else + #if SK_MSCALAR_IS_DOUBLE + // we don't have fixed <-> double macros, use double<->scalar macros + #define SkMScalarToScalar SkDoubleToScalar + #define SkScalarToMScalar SkScalarToDouble + #else + #define SkMScalarToScalar SkFloatToFixed + #define SkScalarToMScalar SkFixedToFloat + #endif +#endif + static const SkMScalar SK_MScalar1 = 1; /////////////////////////////////////////////////////////////////////////////// |