deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC…

include/core/SkScalar.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkScalar_DEFINED
 #define SkScalar_DEFINED
 
 #include "SkFixed.h"
 #include "SkFloatingPoint.h"
 
+//#define SK_SUPPORT_DEPRECATED_SCALARROUND
+
 typedef float   SkScalar;
 
 /** SK_Scalar1 is defined to be 1.0 represented as an SkScalar
 */
 #define SK_Scalar1              (1.0f)
 /** SK_Scalar1 is defined to be 1/2 represented as an SkScalar
 */
 #define SK_ScalarHalf           (0.5f)
 /** SK_ScalarInfinity is defined to be infinity as an SkScalar
 */
@@ skipping 77 matching lines @@
 */
 inline SkScalar SkScalarSquare(SkScalar x) { return x * x; }
 /** Returns the product of two SkScalars
 */
 #define SkScalarMul(a, b)       ((float)(a) * (b))
 /** Returns the product of two SkScalars plus a third SkScalar
 */
 #define SkScalarMulAdd(a, b, c) ((float)(a) * (b) + (c))
 /** Returns the product of a SkScalar and an int rounded to the nearest integer value
 */
-#define SkScalarMulRound(a, b) SkScalarRound((float)(a) * (b))
+#define SkScalarMulRound(a, b) SkScalarRoundToInt((float)(a) * (b))
 /** Returns the product of a SkScalar and an int promoted to the next larger int
 */
-#define SkScalarMulCeil(a, b) SkScalarCeil((float)(a) * (b))
+#define SkScalarMulCeil(a, b) SkScalarCeilToInt((float)(a) * (b))
 /** Returns the product of a SkScalar and an int truncated to the next smaller int
 */
-#define SkScalarMulFloor(a, b) SkScalarFloor((float)(a) * (b))
+#define SkScalarMulFloor(a, b) SkScalarFloorToInt((float)(a) * (b))
 /** Returns the quotient of two SkScalars (a/b)
 */
 #define SkScalarDiv(a, b)       ((float)(a) / (b))
 /** Returns the mod of two SkScalars (a mod b)
 */
 #define SkScalarMod(x,y)        sk_float_mod(x,y)
 /** Returns the product of the first two arguments, divided by the third argument
 */
 #define SkScalarMulDiv(a, b, c) ((float)(a) * (b) / (c))
 /** Returns the multiplicative inverse of the SkScalar (1/x)
@@ skipping 33 matching lines @@
 #define SkScalarLog(x)  (float)sk_float_log(x)
 
 inline SkScalar SkMaxScalar(SkScalar a, SkScalar b) { return a > b ? a : b; }
 inline SkScalar SkMinScalar(SkScalar a, SkScalar b) { return a < b ? a : b; }
 
 static inline bool SkScalarIsInt(SkScalar x) {
     return x == (float)(int)x;
 }
 
 // DEPRECATED : use ToInt or ToScalar variant
-#define SkScalarFloor(x)    SkScalarFloorToInt(x)
-#define SkScalarCeil(x)     SkScalarCeilToInt(x)
-#define SkScalarRound(x)    SkScalarRoundToInt(x)
+#ifdef SK_SUPPORT_DEPRECATED_SCALARROUND
+#   define SkScalarFloor(x)    SkScalarFloorToInt(x)
+#   define SkScalarCeil(x)     SkScalarCeilToInt(x)
+#   define SkScalarRound(x)    SkScalarRoundToInt(x)
+#endif
 
 /**
  *  Returns -1 || 0 || 1 depending on the sign of value:
  *  -1 if x < 0
  *   0 if x == 0
  *   1 if x > 0
  */
 static inline int SkScalarSignAsInt(SkScalar x) {
     return x < 0 ? -1 : (x > 0);
 }
@@ skipping 54 matching lines @@
     SkASSERT(n >= 0);
     for (int i = 0; i < n; ++i) {
         if (a[i] != b[i]) {
             return false;
         }
     }
     return true;
 }
 
 #endif