remove SkFloatToScalar macro

src/core/SkMaskGamma.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 
 #include "SkColor.h"
@@ skipping 18 matching lines @@
     virtual SkScalar fromLuma(SkScalar gamma, SkScalar luma) const SK_OVERRIDE {
         return SkScalarPow(luma, SkScalarInvert(gamma));
     }
 };
 
 class SkSRGBColorSpaceLuminance : public SkColorSpaceLuminance {
     virtual SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const SK_OVERRIDE {
         SkASSERT(0 == gamma);
         //The magic numbers are derived from the sRGB specification.
         //See http://www.color.org/chardata/rgb/srgb.xalter .
-        if (luminance <= SkFloatToScalar(0.04045f)) {
-            return luminance / SkFloatToScalar(12.92f);
+        if (luminance <= 0.04045f) {
+            return luminance / 12.92f;
         }
-        return SkScalarPow((luminance + SkFloatToScalar(0.055f)) / SkFloatToScalar(1.055f),
-                        SkFloatToScalar(2.4f));
+        return SkScalarPow((luminance + 0.055f) / 1.055f,
+                        2.4f);
     }
     virtual SkScalar fromLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luma) const SK_OVERRIDE {
         SkASSERT(0 == gamma);
         //The magic numbers are derived from the sRGB specification.
         //See http://www.color.org/chardata/rgb/srgb.xalter .
-        if (luma <= SkFloatToScalar(0.0031308f)) {
-            return luma * SkFloatToScalar(12.92f);
+        if (luma <= 0.0031308f) {
+            return luma * 12.92f;
         }
-        return SkFloatToScalar(1.055f) * SkScalarPow(luma, SkScalarInvert(SkFloatToScalar(2.4f)))
-               - SkFloatToScalar(0.055f);
+        return 1.055f * SkScalarPow(luma, SkScalarInvert(2.4f))
+               - 0.055f;
     }
 };
 
 /*static*/ const SkColorSpaceLuminance& SkColorSpaceLuminance::Fetch(SkScalar gamma) {
     static SkLinearColorSpaceLuminance gSkLinearColorSpaceLuminance;
     static SkGammaColorSpaceLuminance gSkGammaColorSpaceLuminance;
     static SkSRGBColorSpaceLuminance gSkSRGBColorSpaceLuminance;
 
     if (0 == gamma) {
         return gSkSRGBColorSpaceLuminance;
@@ skipping 51 matching lines @@
             float out = dstConvert.fromLuma(dstGamma, linOut);
 
             //Undo what the blit blend will do.
             float result = (out - dst) / (src - dst);
             SkASSERT(sk_float_round2int(255.0f * result) <= 255);
 
             table[i] = SkToU8(sk_float_round2int(255.0f * result));
         }
     }
 }