remove SkFloatToScalar macro

samplecode/SampleTextOnPath.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 "SkBlurDrawLooper.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "SkPathMeasure.h"
 
 #define REPEAT_COUNT    1
 
 static void textStrokePath(SkCanvas* canvas) {
     SkPaint paint;
     SkPath  path;
     SkRect  rect;
 
     canvas->save();
     canvas->scale(SkIntToScalar(250),SkIntToScalar(250));
 
-    rect.set(SkFloatToScalar(0.0f),  SkFloatToScalar(0.21f),
-             SkFloatToScalar(0.78f), SkFloatToScalar(0.99f));
+    rect.set(0.0f,  0.21f,
+             0.78f, 0.99f);
 
     path.addArc(rect, SkIntToScalar(280), SkIntToScalar(350));
 
     paint.setAntiAlias(true);
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setColor(0xFFFF0000);
-    paint.setTextSize(SkFloatToScalar(0.085f));
-    paint.setStrokeWidth(SkFloatToScalar(.005f));
+    paint.setTextSize(0.085f);
+    paint.setStrokeWidth(.005f);
 
     canvas->drawPath(path, paint);
 
     paint.setLooper(new SkBlurDrawLooper(SK_ColorBLACK,
-                                         SkBlurMask::ConvertRadiusToSigma(SkFloatToScalar(0.002f)),
-                                         SkFloatToScalar(0.0f),
-                                         SkFloatToScalar(0.0f)))->unref();
+                                         SkBlurMask::ConvertRadiusToSigma(0.002f),
+                                         0.0f,
+                                         0.0f))->unref();
 
     const char* text = "DRAWING STROKED TEXT WITH A BLUR ON A PATH";
     size_t      len = strlen(text);
 
     canvas->drawTextOnPathHV(text, len, path, 0,
-                             SkFloatToScalar(-0.025f), paint);
+                             -0.025f, paint);
     canvas->restore();
 }
 
 static void textPathMatrix(SkCanvas* canvas) {
     SkPaint paint;
     SkPath  path;
     SkMatrix matrix;
 
     path.moveTo(SkIntToScalar(050), SkIntToScalar(200));
     path.quadTo(SkIntToScalar(250), SkIntToScalar(000),
@@ skipping 108 matching lines @@
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() {
     return new TextOnPathView;
 }
 
 static SkViewRegister reg(MyFactory);