deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPREC…

src/animator/SkDisplayMath.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 "SkDisplayMath.h"
@@ skipping 137 matching lines @@
         case SK_FUNCTION(asin):
             scalarResult = SkScalarASin(input);
             break;
         case SK_FUNCTION(atan):
             scalarResult = SkScalarATan2(input, SK_Scalar1);
             break;
         case SK_FUNCTION(atan2):
             scalarResult = SkScalarATan2(input, parameters[1].fOperand.fScalar);
             break;
         case SK_FUNCTION(ceil):
-            scalarResult = SkIntToScalar(SkScalarCeil(input));
+            scalarResult = SkScalarCeilToScalar(input);
             break;
         case SK_FUNCTION(cos):
             scalarResult = SkScalarCos(input);
             break;
         case SK_FUNCTION(exp):
             scalarResult = SkScalarExp(input);
             break;
         case SK_FUNCTION(floor):
-            scalarResult = SkIntToScalar(SkScalarFloor(input));
+            scalarResult = SkScalarFloorToScalar(input);
             break;
         case SK_FUNCTION(log):
             scalarResult = SkScalarLog(input);
             break;
         case SK_FUNCTION(max):
             scalarResult = -SK_ScalarMax;
             while (array < end) {
                 scalarResult = SkMaxScalar(scalarResult, array->fOperand.fScalar);
                 array++;
             }
             break;
         case SK_FUNCTION(min):
             scalarResult = SK_ScalarMax;
             while (array < end) {
                 scalarResult = SkMinScalar(scalarResult, array->fOperand.fScalar);
                 array++;
             }
             break;
         case SK_FUNCTION(pow):
             // not the greatest -- but use x^y = e^(y * ln(x))
             scalarResult = SkScalarLog(input);
             scalarResult = SkScalarMul(parameters[1].fOperand.fScalar, scalarResult);
             scalarResult = SkScalarExp(scalarResult);
             break;
         case SK_FUNCTION(random):
             scalarResult = fRandom.nextUScalar1();
             break;
         case SK_FUNCTION(round):
-            scalarResult = SkIntToScalar(SkScalarRound(input));
+            scalarResult = SkScalarRoundToScalar(input);
             break;
         case SK_FUNCTION(sin):
             scalarResult = SkScalarSin(input);
             break;
         case SK_FUNCTION(sqrt): {
             SkASSERT(parameters.count() == 1);
             SkASSERT(type == SkType_Float);
             scalarResult = SkScalarSqrt(input);
             } break;
         case SK_FUNCTION(tan):
@@ skipping 13 matching lines @@
 
 bool SkDisplayMath::getProperty(int index, SkScriptValue* value) const {
     if ((unsigned)index < SK_ARRAY_COUNT(gConstants)) {
         value->fOperand.fScalar = gConstants[index];
         value->fType = SkType_Float;
         return true;
     }
     SkASSERT(0);
     return false;
 }