remove SkFloatToScalar macro

samplecode/SampleArc.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"
 #include "SkGradientShader.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkUtils.h"
 #include "SkComposeShader.h"
 #include "Sk1DPathEffect.h"
 #include "SkCornerPathEffect.h"
 #include "SkPathMeasure.h"
 #include "SkRandom.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkLayerRasterizer.h"
 
 #include "SkParsePath.h"
 static void testparse() {
     SkRect r;
-    r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5f));
+    r.set(0, 0, 10, 10.5f);
     SkPath p, p2;
     SkString str, str2;
 
     p.addRect(r);
     SkParsePath::ToSVGString(p, &str);
     SkParsePath::FromSVGString(str.c_str(), &p2);
     SkParsePath::ToSVGString(p2, &str2);
 }
 
 class ArcsView : public SampleView {
@@ skipping 77 matching lines @@
 
             canvas->translate(w * 8 / 7, 0);
         }
 
         canvas->restore();
     }
 
     virtual void onDrawContent(SkCanvas* canvas) {
         fSweep = SampleCode::GetAnimScalar(SkIntToScalar(360)/24,
                                            SkIntToScalar(360));
-//        fSweep = SkFloatToScalar(359.99f);
+//        fSweep = 359.99f;
 
         SkRect  r;
         SkPaint paint;
 
         paint.setAntiAlias(true);
         paint.setStrokeWidth(SkIntToScalar(2));
         paint.setStyle(SkPaint::kStroke_Style);
 
         r.set(0, 0, SkIntToScalar(200), SkIntToScalar(200));
         r.offset(SkIntToScalar(20), SkIntToScalar(20));
@@ skipping 45 matching lines @@
 private:
     SkScalar fSweep;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new ArcsView; }
 static SkViewRegister reg(MyFactory);