diff options
| author |  mtklein <mtklein@chromium.org> | 2015-06-09 11:47:01 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-09 11:47:01 -0700 |
| commit | 1831f990c31bad0d84641663c96aa8eebf846ab9 (patch) | |
| tree | b6924d3cef071f5c56a37c43cd1de1e45ba7466e /src/utils | |
| parent | 1aca86490410434020eefd2a27ee61a002871391 (diff) | |
A bunch of little SkMScalar-as-float build fixes.
Landing this before http://crrev.com/1169813006 so the test changes needed
there are clearer. This just lets things build with floats, and is a no-op for
doubles.
No public API changes we didn't intend to already have...
TBR=reed@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1173673003
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkMatrix44.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/utils/SkMatrix44.cpp b/src/utils/SkMatrix44.cpp index 731cb41377..c2c9ee4336 100644 --- a/src/utils/SkMatrix44.cpp +++ b/src/utils/SkMatrix44.cpp @@ -473,24 +473,24 @@ bool SkMatrix44::invert(SkMatrix44* inverse) const { double invYScale = 1 / fMat[1][1]; double invZScale = 1 / fMat[2][2]; - inverse->fMat[0][0] = invXScale; + inverse->fMat[0][0] = SkDoubleToMScalar(invXScale); inverse->fMat[0][1] = 0; inverse->fMat[0][2] = 0; inverse->fMat[0][3] = 0; inverse->fMat[1][0] = 0; - inverse->fMat[1][1] = invYScale; + inverse->fMat[1][1] = SkDoubleToMScalar(invYScale); inverse->fMat[1][2] = 0; inverse->fMat[1][3] = 0; inverse->fMat[2][0] = 0; inverse->fMat[2][1] = 0; - inverse->fMat[2][2] = invZScale; + inverse->fMat[2][2] = SkDoubleToMScalar(invZScale); inverse->fMat[2][3] = 0; - inverse->fMat[3][0] = -fMat[3][0] * invXScale; - inverse->fMat[3][1] = -fMat[3][1] * invYScale; - inverse->fMat[3][2] = -fMat[3][2] * invZScale; + inverse->fMat[3][0] = SkDoubleToMScalar(-fMat[3][0] * invXScale); + inverse->fMat[3][1] = SkDoubleToMScalar(-fMat[3][1] * invYScale); + inverse->fMat[3][2] = SkDoubleToMScalar(-fMat[3][2] * invZScale); inverse->fMat[3][3] = 1; inverse->setTypeMask(this->getType()); |