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

Commit 83387a48 authored by Olivier Goutet's avatar Olivier Goutet
Browse files

Correction of an error in the setRotate method of the ColorMatrix class. 

The matrix rotation params around the 2nd axis was not set correctly:

Initial matrix for axis 2 (green):
 cos 0 sin 0 0
  0  1  0  0 0
-sin 0  0  0 0
  0  0 cos 1 0

After correction:
 cos 0 -sin 0 0
  0  1   0  0 0
 sin 0  cos 0 0
  0  0   0  1 0
parent 0b95a572

graphics/java/android/graphics/ColorMatrix.java

+12 −3
Original line number Diff line number Diff line
@@ -110,22 +110,31 @@ public class ColorMatrix { 
        a[18] = aScale;

    }

    

    /**

     * Set the rotation on a color axis by the specified values.

     * axis=0 correspond to a rotation around the RED color

     * axis=1 correspond to a rotation around the GREEN color

     * axis=2 correspond to a rotation around the BLUE color

     */

    public void setRotate(int axis, float degrees) {

        reset();

        float radians = degrees * (float)Math.PI / 180;

        float cosine = FloatMath.cos(radians);

        float sine = FloatMath.sin(radians);

        switch (axis) {

        // Rotation around the red color

        case 0:

            mArray[6] = mArray[12] = cosine;

            mArray[7] = sine;

            mArray[11] = -sine;

            break;

        // Rotation around the green color

        case 1:

            mArray[0] = mArray[17] = cosine;

            mArray[2] = sine;

            mArray[15] = -sine;

            mArray[0] = mArray[12] = cosine;

            mArray[2] = -sine;

            mArray[10] = sine;

            break;

        // Rotation around the blue color

        case 2:

            mArray[0] = mArray[6] = cosine;

            mArray[1] = sine;