Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1191)

Unified Diff: src/core/SkMath.cpp

Issue 136673002: remove remaining references to Sk64 (obsolete) (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkMask.cpp ('k') | src/core/SkMatrix.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkMath.cpp
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp
index e7c4fdcc533263b539837becf4beca7ecc32dfe2..25ac9aa93662a39137446ddbfa17b142ce77bb92 100644
--- a/src/core/SkMath.cpp
+++ b/src/core/SkMath.cpp
@@ -8,7 +8,6 @@
#include "SkMathPriv.h"
#include "SkFloatBits.h"
#include "SkFloatingPoint.h"
-#include "Sk64.h"
#include "SkScalar.h"
const uint32_t gIEEENotANumber = 0x7FFFFFFF;
@@ -47,10 +46,8 @@ int SkCLZ_portable(uint32_t x) {
int32_t SkMulDiv(int32_t numer1, int32_t numer2, int32_t denom) {
SkASSERT(denom);
- Sk64 tmp;
- tmp.setMul(numer1, numer2);
- tmp.div(denom, Sk64::kTrunc_DivOption);
- return tmp.get32();
+ int64_t tmp = sk_64_mul(numer1, numer2) / denom;
+ return sk_64_asS32(tmp);
}
SkFixed SkFixedMul_portable(SkFixed a, SkFixed b) {
« no previous file with comments | « src/core/SkMask.cpp ('k') | src/core/SkMatrix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698