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

src/animator/SkDrawColor.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 "SkDrawColor.h"
@@ skipping 51 matching lines @@
     SkScalar saturation = choice == kGetSaturation ? hsv : RGB_to_HSV(color, kGetSaturation);
     SkScalar value = choice == kGetValue ? hsv : RGB_to_HSV(color, kGetValue);
     value *= 255;
     SkScalar red SK_INIT_TO_AVOID_WARNING;
     SkScalar green SK_INIT_TO_AVOID_WARNING;
     SkScalar blue SK_INIT_TO_AVOID_WARNING;
     if (saturation == 0)    // color is on black-and-white center line
         red = green = blue = value;
     else {
         //SkScalar fraction = SkScalarMod(hue, 60 * SK_Scalar1);
-        int sextant = SkScalarFloor(hue / 60);
+        int sextant = SkScalarFloorToInt(hue / 60);
         SkScalar fraction = hue / 60 - SkIntToScalar(sextant);
         SkScalar p = SkScalarMul(value , SK_Scalar1 - saturation);
         SkScalar q = SkScalarMul(value, SK_Scalar1 - SkScalarMul(saturation, fraction));
         SkScalar t = SkScalarMul(value, SK_Scalar1 -
             SkScalarMul(saturation, SK_Scalar1 - fraction));
         switch (sextant % 6) {
             case 0: red = value; green = t; blue = p; break;
             case 1: red = q; green = value; blue = p; break;
             case 2: red = p; green = value; blue = t; break;
             case 3: red = p; green = q; blue = value; break;
             case 4: red = t;  green = p; blue = value; break;
             case 5: red = value; green = p; blue = q; break;
         }
     }
     //used to say SkToU8((U8CPU) red) etc
-    return SkColorSetARGB(SkColorGetA(color), SkScalarRound(red),
-        SkScalarRound(green), SkScalarRound(blue));
+    return SkColorSetARGB(SkColorGetA(color), SkScalarRoundToInt(red),
+                          SkScalarRoundToInt(green), SkScalarRoundToInt(blue));
 }
 
 #if defined _WIN32 && _MSC_VER >= 1300
 #pragma warning ( pop )
 #endif
 
 enum SkDrawColor_Properties {
     SK_PROPERTY(alpha),
     SK_PROPERTY(blue),
     SK_PROPERTY(green),
@@ skipping 156 matching lines @@
         case SK_PROPERTY(value):
             fValue = scalar;//RGB_to_HSV(color, kGetValue);
             fDirty = true;
             break;
         default:
             SkASSERT(0);
             return false;
     }
     return true;
 }