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

src/animator/SkOperandIterpolator.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 "SkOperandInterpolator.h"
@@ skipping 63 matching lines @@
 
             const SkOperand* prevSrc = nextSrc - fElemCount;
 
             if (fType == SkType_Float || fType == SkType_3D_Point) {
                 for (int i = fElemCount - 1; i >= 0; --i)
                     values[i].fScalar = SkScalarInterp(prevSrc[i].fScalar, nextSrc[i].fScalar, T);
             } else if (fType == SkType_Int || fType == SkType_MSec) {
                 for (int i = fElemCount - 1; i >= 0; --i) {
                     int32_t a = prevSrc[i].fS32;
                     int32_t b = nextSrc[i].fS32;
-                    values[i].fS32 = a + SkScalarRound((b - a) * T);
+                    values[i].fS32 = a + SkScalarRoundToInt((b - a) * T);
                 }
             } else
                 memcpy(values, prevSrc, sizeof(SkOperand) * fElemCount);
         }
     }
     return result;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////
@@ skipping 45 matching lines @@
     SkASSERT(memcmp(v, iset(vv, 60, 120, 180), sizeof(v)) == 0);
 
     result = inter.timeToValues(125, v);
     SkASSERT(result == kNormal_Result);
     result = inter.timeToValues(175, v);
     SkASSERT(result == kNormal_Result);
 #endif
 }
 
 #endif