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

Commit e7078594 authored by Romain Guy's avatar Romain Guy
Browse files

Load identity matrix when calling Canvas.setMatrix(null) 

Bug #5446826

Change-Id: I3a7817f266b17e9abe948500816d629edd9a2822
parent ee5954a8

core/java/android/view/GLES20Canvas.java

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ class GLES20Canvas extends HardwareCanvas { 


    @Override

    public void setMatrix(Matrix matrix) {

        nSetMatrix(mRenderer, matrix.native_instance);

        nSetMatrix(mRenderer, matrix == null ? 0 : matrix.native_instance);

    }

    

    private static native void nSetMatrix(int renderer, int matrix);

libs/hwui/OpenGLRenderer.cpp

+5 −1
Original line number Diff line number Diff line
@@ -939,7 +939,11 @@ void OpenGLRenderer::skew(float sx, float sy) { 
}



void OpenGLRenderer::setMatrix(SkMatrix* matrix) {

    if (matrix) {

        mSnapshot->transform->load(*matrix);

    } else {

        mSnapshot->transform->loadIdentity();

    }

}



void OpenGLRenderer::getMatrix(SkMatrix* matrix) {