remove SkFloatToScalar macro

src/utils/SkCamera.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCamera.h"
@@ skipping 347 matching lines @@
 void Sk3DView::restore() {
     SkASSERT(fRec != &fInitialRec);
     Rec* next = fRec->fNext;
     SkDELETE(fRec);
     fRec = next;
 }
 
 #ifdef SK_BUILD_FOR_ANDROID
 void Sk3DView::setCameraLocation(SkScalar x, SkScalar y, SkScalar z) {
     // the camera location is passed in inches, set in pt
-    SkScalar lz = z * SkFloatToScalar(72.0f);
-    fCamera.fLocation.set(x * SkFloatToScalar(72.0f), y * SkFloatToScalar(72.0f), lz);
+    SkScalar lz = z * 72.0f;
+    fCamera.fLocation.set(x * 72.0f, y * 72.0f, lz);
     fCamera.fObserver.set(0, 0, lz);
     fCamera.update();
 
 }
 
 SkScalar Sk3DView::getCameraLocationX() {
-    return fCamera.fLocation.fX / SkFloatToScalar(72.0f);
+    return fCamera.fLocation.fX / 72.0f;
 }
 
 SkScalar Sk3DView::getCameraLocationY() {
-    return fCamera.fLocation.fY / SkFloatToScalar(72.0f);
+    return fCamera.fLocation.fY / 72.0f;
 }
 
 SkScalar Sk3DView::getCameraLocationZ() {
-    return fCamera.fLocation.fZ / SkFloatToScalar(72.0f);
+    return fCamera.fLocation.fZ / 72.0f;
 }
 #endif
 
 void Sk3DView::translate(SkScalar x, SkScalar y, SkScalar z) {
     fRec->fMatrix.preTranslate(x, y, z);
 }
 
 void Sk3DView::rotateX(SkScalar deg) {
     fRec->fMatrix.preRotateX(deg);
 }
@@ skipping 21 matching lines @@
 }
 
 #include "SkCanvas.h"
 
 void Sk3DView::applyToCanvas(SkCanvas* canvas) const {
     SkMatrix    matrix;
 
     this->getMatrix(&matrix);
     canvas->concat(matrix);
 }