add round/ceil/etc. for SkMScalar

include/utils/SkMatrix44.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkMatrix44_DEFINED
 #define SkMatrix44_DEFINED
 
@@ skipping 15 matching lines @@
     static inline double SkDoubleToMScalar(double x) {
         return x;
     }
     static inline double SkMScalarToDouble(double x) {
         return x;
     }
     static inline double SkMScalarAbs(double x) {
         return fabs(x);
     }
     static const SkMScalar SK_MScalarPI = 3.141592653589793;
+
+    #define SkMScalarFloor(x)           sk_double_floor(x)
+    #define SkMScalarCeil(x)            sk_double_ceil(x)
+    #define SkMScalarRound(x)           sk_double_round(x)
+
+    #define SkMScalarFloorToInt(x)      sk_double_floor2int(x)
+    #define SkMScalarCeilToInt(x)       sk_double_ceil2int(x)
+    #define SkMScalarRoundToInt(x)      sk_double_round2int(x)
+
+
 #elif defined SK_MSCALAR_IS_FLOAT
 #ifdef SK_MSCALAR_IS_DOUBLE
     #error "can't define MSCALAR both as DOUBLE and FLOAT"
 #endif
     typedef float SkMScalar;
 
     static inline float SkFloatToMScalar(float x) {
         return x;
     }
     static inline float SkMScalarToFloat(float x) {
         return x;
     }
     static inline float SkDoubleToMScalar(double x) {
         return static_cast<float>(x);
     }
     static inline double SkMScalarToDouble(float x) {
         return static_cast<double>(x);
     }
     static inline float SkMScalarAbs(float x) {
         return sk_float_abs(x);
     }
     static const SkMScalar SK_MScalarPI = 3.14159265f;
+
+    #define SkMScalarFloor(x)           sk_float_floor(x)
+    #define SkMScalarCeil(x)            sk_float_ceil(x)
+    #define SkMScalarRound(x)           sk_float_round(x)
+
+    #define SkMScalarFloorToInt(x)      sk_float_floor2int(x)
+    #define SkMScalarCeilToInt(x)       sk_float_ceil2int(x)
+    #define SkMScalarRoundToInt(x)      sk_float_round2int(x)
+
 #endif
 
-#define SkMScalarToScalar SkMScalarToFloat
-#define SkScalarToMScalar SkFloatToMScalar
+#define SkIntToMScalar(n)       static_cast<SkMScalar>(n)
+
+#define SkMScalarToScalar(x)    SkMScalarToFloat(x)
+#define SkScalarToMScalar(x)    SkFloatToMScalar(x)
 
 static const SkMScalar SK_MScalar1 = 1;
 
 ///////////////////////////////////////////////////////////////////////////////
 
 struct SkVector4 {
     SkScalar fData[4];
 
     SkVector4() {
         this->set(0, 0, 0, 1);
@@ skipping 363 matching lines @@
     /**
      *  Does not take the time to 'compute' the typemask. Only returns true if
      *  we already know that this matrix is identity.
      */
     inline bool isTriviallyIdentity() const {
         return 0 == fTypeMask;
     }
 };
 
 #endif