Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab614e54 authored by Chris Craik's avatar Chris Craik Committed by Android Git Automerger
Browse files

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

* commit '30eaf590':
  Simplify matrix copy constructor/load
parents 70c4b873 30eaf590

libs/hwui/Matrix.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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) {

libs/hwui/Matrix.h

+0 −4
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ public: 
        load(v);

    }



    Matrix4(const Matrix4& v) {

        load(v);

    }



    Matrix4(const SkMatrix& v) {

        load(v);

    }