remove SkFloatToScalar macro

samplecode/SamplePolyToPoly.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 "SkView.h"
 #include "SkCanvas.h"
@@ skipping 23 matching lines @@
             m2.set(SkMatrix::kMScaleX, dst[1].fX - dst[0].fX);
             m2.set(SkMatrix::kMSkewX,  dst[2].fX - dst[0].fX);
             m2.set(SkMatrix::kMTransX, dst[0].fX);
             m2.set(SkMatrix::kMSkewY,  dst[1].fY - dst[0].fY);
             m2.set(SkMatrix::kMScaleY, dst[2].fY - dst[0].fY);
             m2.set(SkMatrix::kMTransY, dst[0].fY);
 
             m1.reset();
 
             const SkScalar src1[] = {
-                0, 0, 0, SkFloatToScalar(427), SkFloatToScalar(316), SkFloatToScalar(427), SkFloatToScalar(316), 0
+                0, 0, 0, 427, 316, 427, 316, 0
             };
             const SkScalar dst1[] = {
-                SkFloatToScalar(158), SkFloatToScalar(177.5f), SkFloatToScalar(158), SkFloatToScalar(249.5f),
-                SkFloatToScalar(158), SkFloatToScalar(604.5f), SkFloatToScalar(158), SkFloatToScalar(-177.5f)
+                158, 177.5f, 158, 249.5f,
+                158, 604.5f, 158, -177.5f
             };
 
             (void) m2.setPolyToPoly((const SkPoint*)src1, (SkPoint*)dst1, 4);
 
             {
                 const SkPoint src[] = {
                     { SkIntToScalar(1), SkIntToScalar(0) },
                     { SkIntToScalar(4), SkIntToScalar(7) },
                     { SkIntToScalar(10), SkIntToScalar(2) }
                 };
@@ skipping 46 matching lines @@
 
         SkPaint::FontMetrics fm;
         paint->getFontMetrics(&fm);
         paint->setColor(SK_ColorRED);
         paint->setStyle(SkPaint::kFill_Style);
         SkScalar x = D/2;
         float y = D/2 - (fm.fAscent + fm.fDescent)/2;
         SkString str;
         str.appendS32(count);
         canvas->drawText(str.c_str(), str.size(),
-                         x, SkFloatToScalar(y),
+                         x, y,
                          *paint);
 
         canvas->restore();
     }
 
     virtual void onDrawContent(SkCanvas* canvas) {
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setStrokeWidth(SkIntToScalar(4));
         paint.setTextSize(SkIntToScalar(40));
@@ skipping 33 matching lines @@
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new PolyToPolyView; }
 static SkViewRegister reg(MyFactory);