commit d2bfcc74fcea6d5ee199da514e075efeeb1165fd
author Chris Craik <ccraik@google.com> Tue Jul 07 09:59:23 2015 -0700
committer Chris Craik <ccraik@google.com> Tue Jul 07 10:09:35 2015 -0700
tree 215cabbc08e089564d9199d518581b0fb15d4c19
parent 61d7acae0cafc265e94a35ad3ba1677f60346de9

Simplify matrix copy constructor/load

bug:22208220

Change-Id: Id096eb8de8da0dd1687d6af9456b16ce2a1a589b

libs/hwui/Matrix.cpp

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 Matrix4& v) {
-    memcpy(data, v.data, sizeof(data));
-    mType = v.getType();
+    *this = v;
 }
 
 void Matrix4::load(const SkMatrix& v) {

libs/hwui/Matrix.h

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 @@
         load(v);
     }
 
-    Matrix4(const Matrix4& v) {
-        load(v);
-    }
-
     Matrix4(const SkMatrix& v) {
         load(v);
     }