remove unused SkFixed and SkFract functions

tests/MathTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "TestClassDef.h"
 #include "SkColorPriv.h"
@@ skipping 409 matching lines @@
         SkScalar sx = rand.nextSScalar1();
         REPORTER_ASSERT(reporter, SkScalarCopySign(sx, sx) == sx);
         REPORTER_ASSERT(reporter, SkScalarCopySign(sx, -sx) == -sx);
         REPORTER_ASSERT(reporter, SkScalarCopySign(-sx, sx) == sx);
         REPORTER_ASSERT(reporter, SkScalarCopySign(-sx, -sx) == -sx);
     }
 }
 
 DEF_TEST(Math, reporter) {
     int         i;
-    int32_t     x;
     SkRandom    rand;
 
     // these should assert
 #if 0
     SkToS8(128);
     SkToS8(-129);
     SkToU8(256);
     SkToU8(-5);
 
     SkToS16(32768);
@@ skipping 11 matching lines @@
 
     test_muldiv255(reporter);
     test_muldiv255ceiling(reporter);
     test_copysign(reporter);
 
     {
         SkScalar x = SK_ScalarNaN;
         REPORTER_ASSERT(reporter, SkScalarIsNaN(x));
     }
 
-    for (i = 1; i <= 10; i++) {
-        x = SkCubeRootBits(i*i*i, 11);
-        REPORTER_ASSERT(reporter, x == i);
-    }
-
-    x = SkFixedSqrt(SK_Fixed1);
-    REPORTER_ASSERT(reporter, x == SK_Fixed1);
-    x = SkFixedSqrt(SK_Fixed1/4);
-    REPORTER_ASSERT(reporter, x == SK_Fixed1/2);
-    x = SkFixedSqrt(SK_Fixed1*4);
-    REPORTER_ASSERT(reporter, x == SK_Fixed1*2);
-
-    x = SkFractSqrt(SK_Fract1);
-    REPORTER_ASSERT(reporter, x == SK_Fract1);
-    x = SkFractSqrt(SK_Fract1/4);
-    REPORTER_ASSERT(reporter, x == SK_Fract1/2);
-    x = SkFractSqrt(SK_Fract1/16);
-    REPORTER_ASSERT(reporter, x == SK_Fract1/4);
-
-    for (i = 1; i < 100; i++) {
-        x = SkFixedSqrt(SK_Fixed1 * i * i);
-        REPORTER_ASSERT(reporter, x == SK_Fixed1 * i);
-    }
-
     for (i = 0; i < 1000; i++) {
         int value = rand.nextS16();
         int max = rand.nextU16();
 
         int clamp = SkClampMax(value, max);
         int clamp2 = value < 0 ? 0 : (value > max ? max : value);
         REPORTER_ASSERT(reporter, clamp == clamp2);
     }
 
     for (i = 0; i < 10000; i++) {
@@ skipping 32 matching lines @@
         (void)SkCLZ(denom);
 
         REPORTER_ASSERT(reporter, result != (SkFixed)SK_NaN32);
         if (check > SK_MaxS32) {
             check = SK_MaxS32;
         } else if (check < -SK_MaxS32) {
             check = SK_MinS32;
         }
         REPORTER_ASSERT(reporter, result == (int32_t)check);
 
-        result = SkFractDiv(numer, denom);
-        check = ((SkLONGLONG)numer << 30) / denom;
-
-        REPORTER_ASSERT(reporter, result != (SkFixed)SK_NaN32);
-        if (check > SK_MaxS32) {
-            check = SK_MaxS32;
-        } else if (check < -SK_MaxS32) {
-            check = SK_MinS32;
-        }
-        REPORTER_ASSERT(reporter, result == (int32_t)check);
-
         // make them <= 2^24, so we don't overflow in fixmul
         numer = numer << 8 >> 8;
         denom = denom << 8 >> 8;
 
         result = SkFixedMul(numer, denom);
         SkFixed r2 = symmetric_fixmul(numer, denom);
         //        SkASSERT(result == r2);
 
         result = SkFixedMul(numer, numer);
         r2 = SkFixedSquare(numer);
         REPORTER_ASSERT(reporter, result == r2);
-
-        if (numer >= 0 && denom >= 0) {
-            SkFixed mean = SkFixedMean(numer, denom);
-            float prod = SkFixedToFloat(numer) * SkFixedToFloat(denom);
-            float fm = sk_float_sqrt(sk_float_abs(prod));
-            SkFixed mean2 = SkFloatToFixed(fm);
-            int diff = SkAbs32(mean - mean2);
-            REPORTER_ASSERT(reporter, diff <= 1);
-        }
-
-        {
-            SkFixed mod = SkFixedMod(numer, denom);
-            float n = SkFixedToFloat(numer);
-            float d = SkFixedToFloat(denom);
-            float m = sk_float_mod(n, d);
-            // ensure the same sign
-            REPORTER_ASSERT(reporter, mod == 0 || (mod < 0) == (m < 0));
-            int diff = SkAbs32(mod - SkFloatToFixed(m));
-            REPORTER_ASSERT(reporter, (diff >> 7) == 0);
-        }
     }
 #endif
 
-    for (i = 0; i < 10000; i++) {
-        SkFract x = rand.nextU() >> 1;
-        double xx = (double)x / SK_Fract1;
-        SkFract xr = SkFractSqrt(x);
-        SkFract check = SkFloatToFract(sqrt(xx));
-        REPORTER_ASSERT(reporter, xr == check ||
-                                  xr == check-1 ||
-                                  xr == check+1);
-
-        xr = SkFixedSqrt(x);
-        xx = (double)x / SK_Fixed1;
-        check = SkFloatToFixed(sqrt(xx));
-        REPORTER_ASSERT(reporter, xr == check || xr == check-1);
-
-        xr = SkSqrt32(x);
-        xx = (double)x;
-        check = (int32_t)sqrt(xx);
-        REPORTER_ASSERT(reporter, xr == check || xr == check-1);
-    }
-
     test_blend(reporter);
 
     if (false) test_floor(reporter);
 
     // disable for now
     if (false) test_blend31();  // avoid bit rot, suppress warning
 
     test_muldivround(reporter);
     test_clz(reporter);
 }
@@ skipping 98 matching lines @@
     test_divmod<int16_t>(r);
 }
 
 DEF_TEST(divmod_s32, r) {
     test_divmod<int32_t>(r);
 }
 
 DEF_TEST(divmod_s64, r) {
     test_divmod<int64_t>(r);
 }