diff options
| author | Chris Craik <ccraik@google.com> | 2015-07-07 09:59:23 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-07-07 10:09:35 -0700 |
| commit | d2bfcc74fcea6d5ee199da514e075efeeb1165fd (patch) | |
| tree | 215cabbc08e089564d9199d518581b0fb15d4c19 /libs | |
| parent | 61d7acae0cafc265e94a35ad3ba1677f60346de9 (diff) | |
| download | frameworks_base-d2bfcc74fcea6d5ee199da514e075efeeb1165fd.zip frameworks_base-d2bfcc74fcea6d5ee199da514e075efeeb1165fd.tar.gz frameworks_base-d2bfcc74fcea6d5ee199da514e075efeeb1165fd.tar.bz2 | |
Simplify matrix copy constructor/load
bug:22208220
Change-Id: Id096eb8de8da0dd1687d6af9456b16ce2a1a589b
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); } |