commit df134e8722efe489ccdc23cb276c98e20ff74738
author Chris Craik <ccraik@google.com> Tue Jul 07 19:22:34 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 07 19:22:34 2015 +0000
tree 48f1998d73045e40012eb0dd6e1245bcf3dfd232
parent eb9c86131ebb07729db712f357ff2f9770b30f1a
parent 54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793

am 54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev

* commit '54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793':
  Simplify matrix copy constructor/load

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);
     }