remove SkFloatToScalar macro

samplecode/SampleAll.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkBlurMask.h"
 #include "SkCanvas.h"
@@ skipping 267 matching lines @@
     }
 
     virtual bool onClick(Click* click) {
         return this->INHERITED::onClick(click);
     }
 
     void makePath(SkPath& path) {
         path.addCircle(SkIntToScalar(20), SkIntToScalar(20), SkIntToScalar(20),
             SkPath::kCCW_Direction);
         for (int index = 0; index < 10; index++) {
-            SkScalar x = SkFloatToScalar((float) cos(index / 10.0f * 2 * 3.1415925358f));
-            SkScalar y = SkFloatToScalar((float) sin(index / 10.0f * 2 * 3.1415925358f));
+            SkScalar x = (float) cos(index / 10.0f * 2 * 3.1415925358f);
+            SkScalar y = (float) sin(index / 10.0f * 2 * 3.1415925358f);
             x *= index & 1 ? 7 : 14;
             y *= index & 1 ? 7 : 14;
             x += SkIntToScalar(20);
             y += SkIntToScalar(20);
             if (index == 0)
                 path.moveTo(x, y);
             else
                 path.lineTo(x, y);
         }
         path.close();
@@ skipping 341 matching lines @@
 private:
     SkPoint fClickPt;
     SkBitmap fBug, fTb, fTx;
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new DemoView; }
 static SkViewRegister reg(MyFactory);