aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/utils
diff options
context:
space:
mode:
authorGravatar vollick@chromium.org <vollick@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-13 20:12:00 +0000
committerGravatar vollick@chromium.org <vollick@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-13 20:12:00 +0000
commit5596a69e9f7884e3042bceba071c468dee52aa7f (patch)
treef2c0dea0b4b216f82a8010ed7c29376f58c8e6c8 /include/utils
parenta09e8838f2534d42046338752482d6759f6c649d (diff)
Add support for SK_MSCALAR_IS_FLOAT
The default is SK_MSCALAR_IS_FLOAT. You'll have to explicitly define SK_MSCALAR_IS_DOUBLE if that's what you want. BUG=None Review URL: https://codereview.appspot.com/6843049 git-svn-id: http://skia.googlecode.com/svn/trunk@6403 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/SkMatrix44.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/utils/SkMatrix44.h b/include/utils/SkMatrix44.h
index 8c6d0350dd..97faf783f4 100644
--- a/include/utils/SkMatrix44.h
+++ b/include/utils/SkMatrix44.h
@@ -29,7 +29,7 @@
return x;
}
static const SkMScalar SK_MScalarPI = 3.141592653589793;
-#else
+#elif defined SK_MSCALAR_IS_FLOAT
typedef float SkMScalar;
static inline float SkFloatToMScalar(float x) {
return x;
@@ -202,7 +202,7 @@ public:
#ifdef SK_MSCALAR_IS_DOUBLE
void mapMScalars(const SkMScalar src[4], SkMScalar dst[4]) const;
-#else
+#elif defined SK_MSCALAR_IS_FLOAT
void mapMScalars(const SkMScalar src[4], SkMScalar dst[4]) const {
this->mapScalars(src, dst);
}