diff options
| author | Chris Craik <ccraik@google.com> | 2015-07-07 19:09:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 19:09:43 +0000 |
| commit | 54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793 (patch) | |
| tree | 104075b0fe5dd03570fa8290a833db0eccdada4b /libs | |
| parent | 024bce82292786f9b71da488f06a0bb35d029bbf (diff) | |
| parent | d2bfcc74fcea6d5ee199da514e075efeeb1165fd (diff) | |
| download | frameworks_base-54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793.zip frameworks_base-54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793.tar.gz frameworks_base-54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793.tar.bz2 | |
Merge "Simplify matrix copy constructor/load" into mnc-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/Matrix.cpp | 3 | ||||
| -rw-r--r-- | libs/hwui/Matrix.h | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/libs/hwui/Matrix.cpp b/libs/hwui/Matrix.cpp index 061d26a..06e67c0 100644 --- a/libs/hwui/Matrix.cpp +++ b/libs/hwui/Matrix.cpp @@ -155,8 +155,7 @@ void Matrix4::load(const float* v) { } void Matrix4::load(const Matrix4& v) { - memcpy(data, v.data, sizeof(data)); - mType = v.getType(); + *this = v; } void Matrix4::load(const SkMatrix& v) { diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h index c152789..ed54a25 100644 --- a/libs/hwui/Matrix.h +++ b/libs/hwui/Matrix.h @@ -85,10 +85,6 @@ public: load(v); } - Matrix4(const Matrix4& v) { - load(v); - } - Matrix4(const SkMatrix& v) { load(v); } |