From 20d44677a1940c17ae9c64420b013d76bf895dd5 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 9 Nov 2012 21:28:55 +0000 Subject: [PATCH] simplify macros, since we no longer support scalar == fixed git-svn-id: http://skia.googlecode.com/svn/trunk@6372 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/utils/SkMatrix44.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/include/utils/SkMatrix44.h b/include/utils/SkMatrix44.h index 93140b022d..c59aa75603 100644 --- a/include/utils/SkMatrix44.h +++ b/include/utils/SkMatrix44.h @@ -46,19 +46,8 @@ 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 +#define SkMScalarToScalar SkMScalarToFloat +#define SkScalarToMScalar SkFloatToMScalar static const SkMScalar SK_MScalar1 = 1;