diff options
author | 2014-01-24 18:48:00 +0000 | |
---|---|---|
committer | 2014-01-24 18:48:00 +0000 | |
commit | bde4ba2ce6994a57f1b4e820ac83e9d27caf75de (patch) | |
tree | dcadef7f6b4cf3558c49efe2f2f9217a241aeebf /src/utils | |
parent | d1630e8fc0eb27dbe75ed0fed6d2b1c7b359bf76 (diff) |
Revert of Use SkMScalar as intermediates in SkMatrix44::setConcat. (https://codereview.chromium.org/146823002/)
Reason for revert:
This will break many Chromium tests when we roll.
Original issue's description:
> Use SkMScalar as intermediates in SkMatrix44::setConcat.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=13167
R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/147033002
git-svn-id: http://skia.googlecode.com/svn/trunk@13173 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/SkMatrix44.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/utils/SkMatrix44.cpp b/src/utils/SkMatrix44.cpp index f4b6aa4804..a7133ec1a7 100644 --- a/src/utils/SkMatrix44.cpp +++ b/src/utils/SkMatrix44.cpp @@ -383,11 +383,11 @@ void SkMatrix44::setConcat(const SkMatrix44& a, const SkMatrix44& b) { } else { for (int j = 0; j < 4; j++) { for (int i = 0; i < 4; i++) { - SkMScalar value = 0; + double value = 0; for (int k = 0; k < 4; k++) { - value += a.fMat[k][i] * b.fMat[j][k]; + value += SkMScalarToDouble(a.fMat[k][i]) * b.fMat[j][k]; } - *result++ = value; + *result++ = SkDoubleToMScalar(value); } } } |