Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '54d1f0439eb0fef47e9e9c7ac3d6ec5b283c4793':
  Simplify matrix copy constructor/load
This commit is contained in:
Chris Craik
2015-07-07 19:22:34 +00:00
committed by Android Git Automerger
parent eb9c86131e 54d1f0439e
commit df134e8722
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/Matrix.cpp
View File

@@ -155,8 +155,7 @@ void Matrix4::load(const float* v) {
} }
void Matrix4::load(const Matrix4& v) { void Matrix4::load(const Matrix4& v) {
memcpy(data, v.data, sizeof(data)); *this = v;
mType = v.getType();
} }
void Matrix4::load(const SkMatrix& v) { void Matrix4::load(const SkMatrix& v) {

4
libs/hwui/Matrix.h
View File

@@ -85,10 +85,6 @@ public:
load(v); load(v);
} }
Matrix4(const Matrix4& v) {
load(v);
}
Matrix4(const SkMatrix& v) { Matrix4(const SkMatrix& v) {
load(v); load(v);
} }