diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-05-19 16:22:09 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-05-19 16:22:09 -0700 |
| commit | 0a870594527a3af036b1238983abfe4e6118178b (patch) | |
| tree | 00fb32ee1aececd738f876f1ab243529b8fddecc /libs/hwui/Matrix.cpp | |
| parent | 93510f46e0f4be83fae3a81fb7aac61de8728b42 (diff) | |
| parent | 404e2b21fc197ab8ad889eef5146845e56eca88d (diff) | |
resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp
Change-Id: I3c486e83a3f2b27ee0e6bfe4e3bba3df3af758a5
Diffstat (limited to 'libs/hwui/Matrix.cpp')
| -rw-r--r-- | libs/hwui/Matrix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Matrix.cpp b/libs/hwui/Matrix.cpp index 709156c4098b..a936661f86f9 100644 --- a/libs/hwui/Matrix.cpp +++ b/libs/hwui/Matrix.cpp @@ -419,7 +419,7 @@ void Matrix4::mapPoint3d(Vector3& vec) const { vec.z = orig.x * data[2] + orig.y * data[6] + orig.z * data[kScaleZ] + data[kTranslateZ]; } -#define MUL_ADD_STORE(a, b, c) a = (a) * (b) + (c) +#define MUL_ADD_STORE(a, b, c) ((a) = (a) * (b) + (c)) void Matrix4::mapPoint(float& x, float& y) const { if (isSimple()) { |