move SkSqrt32 back into SkMath.h -- was referenced in SkEmbossMask.cpp

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

diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 42f830c..e8d8f76 100644 (file)
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -31,6 +31,10 @@ int32_t SkDivBits(int32_t numer, int32_t denom, int shift);
  */
 int32_t SkSqrtBits(int32_t value, int bitBias);
 
+/** Return the integer square root of n, treated as a SkFixed (16.16)
+ */
+#define SkSqrt32(n)         SkSqrtBits(n, 15)
+
 ///////////////////////////////////////////////////////////////////////////////
 
 //! Returns the number of leading zero bits (0...32)

diff --git a/src/core/SkMathPriv.h b/src/core/SkMathPriv.h
index 055acc4..6fac124 100644 (file)
--- a/src/core/SkMathPriv.h
+++ b/src/core/SkMathPriv.h
@@ -53,10 +53,6 @@ static inline unsigned SkClampUMax(unsigned value, unsigned max) {
  */
 int32_t SkMulShift(int32_t a, int32_t b, unsigned shift);
 
-/** Return the integer square root of n, treated as a SkFixed (16.16)
- */
-#define SkSqrt32(n)         SkSqrtBits(n, 15)
-
 /** Return the integer cube root of value, with a bias of bitBias
  */
 int32_t SkCubeRootBits(int32_t value, int bitBias);