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

simplify macros, since we no longer support scalar == fixed

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@6372 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2012-11-09 21:28:55 +00:00
parent 80b577eba6
commit 20d44677a1
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/utils/SkMatrix44.h
View File

@ -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;