remove SkFloatToScalar macro

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
@@ skipping 60 matching lines @@
     */
     #define SkIntToScalar(n)        ((float)(n))
     /** SkFixedToScalar(n) returns its SkFixed argument as an SkScalar
     */
     #define SkFixedToScalar(x)      SkFixedToFloat(x)
     /** SkScalarToFixed(n) returns its SkScalar argument as an SkFixed
     */
     #define SkScalarToFixed(x)      SkFloatToFixed(x)
 
     #define SkScalarToFloat(n)      (n)
+#ifndef SK_SCALAR_TO_FLOAT_EXCLUDED
     #define SkFloatToScalar(n)      (n)
+#endif
 
     #define SkScalarToDouble(n)      (double)(n)
     #define SkDoubleToScalar(n)      (float)(n)
 
     /** SkScalarFraction(x) returns the signed fractional part of the argument
     */
     #define SkScalarFraction(x)     sk_float_mod(x, 1.0f)
 
     #define SkScalarFloorToScalar(x)    sk_float_floor(x)
     #define SkScalarCeilToScalar(x)     sk_float_ceil(x)
@@ skipping 99 matching lines @@
     #define SK_ScalarMax            SK_FixedMax
     #define SK_ScalarMin            SK_FixedMin
     #define SK_ScalarNaN            SK_FixedNaN
     #define SkScalarIsNaN(x)        ((x) == SK_FixedNaN)
     #define SkScalarIsFinite(x)     ((x) != SK_FixedNaN)
 
     #define SkIntToScalar(n)        SkIntToFixed(n)
     #define SkFixedToScalar(x)      (x)
     #define SkScalarToFixed(x)      (x)
     #define SkScalarToFloat(n)  SkFixedToFloat(n)
+#ifndef SK_SCALAR_TO_FLOAT_EXCLUDED
     #define SkFloatToScalar(n)  SkFloatToFixed(n)
+#endif
 
     #define SkScalarToDouble(n) SkFixedToDouble(n)
     #define SkDoubleToScalar(n) SkDoubleToFixed(n)
     #define SkScalarFraction(x)     SkFixedFraction(x)
 
     #define SkScalarFloorToScalar(x)    SkFixedFloorToFixed(x)
     #define SkScalarCeilToScalar(x)     SkFixedCeilToFixed(x)
     #define SkScalarRoundToScalar(x)    SkFixedRoundToFixed(x)
 
     #define SkScalarFloorToInt(x)       SkFixedFloorToInt(x)
@@ skipping 120 matching lines @@
             return false;
         }
     }
     return true;
 #else
     return 0 == memcmp(a, b, n * sizeof(SkScalar));
 #endif
 }
 
 #endif