Merge "Simplify matrix copy constructor/load" into mnc-dev

2015-07-07 19:09:41 +00:00
parent 024bce8229 d2bfcc74fc
commit 54d1f0439e
2 changed files with 1 additions and 6 deletions
--- 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) {
--- 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);
    }