commit e1ca705cac4b946993f6cbf798e2a0ba27e739f3
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 17 19:22:07 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Dec 17 19:22:07 2013 +0000
tree 9757af858cadeea671264651780935b00d8c0252
parent 3fb15f4d21292a319dc6522bfc99c89a7a5eac68

deprecate SkScalarRound (and its ilk), use SkScalarRound[ToInt,ToScalar]. #define SK_SUPPORT_DEPRECATED_SCALARROUND for legacy clients

BUG=
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/111353003

git-svn-id: http://skia.googlecode.com/svn/trunk@12719 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkRTree.cpp

diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp
index 253a7ee..fe08437 100644
--- a/src/core/SkRTree.cpp
+++ b/src/core/SkRTree.cpp
@@ -345,9 +345,9 @@
             }
         }
 
-        int numStrips = SkScalarCeil(SkScalarSqrt(SkIntToScalar(numBranches) *
+        int numStrips = SkScalarCeilToInt(SkScalarSqrt(SkIntToScalar(numBranches) *
                                      SkScalarInvert(fAspectRatio)));
-        int numTiles = SkScalarCeil(SkIntToScalar(numBranches) /
+        int numTiles = SkScalarCeilToInt(SkIntToScalar(numBranches) /
                                     SkIntToScalar(numStrips));
         int currentBranch = 0;