begin to remove SkLONGLONG and wean Skia off of Sk64
BUG=
R=caryclark@google.com
Review URL: https://codereview.chromium.org/99433009
git-svn-id: http://skia.googlecode.com/svn/trunk@12788 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 1b8954a..3efbbcb 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -188,7 +188,6 @@
}
}
-#if defined(SkLONGLONG)
static int symmetric_fixmul(int a, int b) {
int sa = SkExtractSign(a);
int sb = SkExtractSign(b);
@@ -196,19 +195,9 @@
a = SkApplySign(a, sa);
b = SkApplySign(b, sb);
-#if 1
- int c = (int)(((SkLONGLONG)a * b) >> 16);
-
+ int c = (int)(((int64_t)a * b) >> 16);
return SkApplySign(c, sa ^ sb);
-#else
- SkLONGLONG ab = (SkLONGLONG)a * b;
- if (sa ^ sb) {
- ab = -ab;
- }
- return ab >> 16;
-#endif
}
-#endif
static void check_length(skiatest::Reporter* reporter,
const SkPoint& p, SkScalar targetLen) {
@@ -492,12 +481,11 @@
unittest_fastfloat(reporter);
unittest_isfinite(reporter);
-#ifdef SkLONGLONG
for (i = 0; i < 10000; i++) {
SkFixed numer = rand.nextS();
SkFixed denom = rand.nextS();
SkFixed result = SkFixedDiv(numer, denom);
- SkLONGLONG check = ((SkLONGLONG)numer << 16) / denom;
+ int64_t check = ((int64_t)numer << 16) / denom;
(void)SkCLZ(numer);
(void)SkCLZ(denom);
@@ -522,7 +510,6 @@
r2 = SkFixedSquare(numer);
REPORTER_ASSERT(reporter, result == r2);
}
-#endif
test_blend(reporter);