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

Merge change 3337 into donut

Browse Source 
* changes:
  Fix external bug 2875: Matrix#mValues[7] assigned twice in place of mValues[8]
This commit is contained in:
Android (Google) Code Review
2009-06-05 13:15:26 -07:00
parent 3966536766 1741ec39a9
commit 47538fe613
1 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/layoutlib/bridge/src/android/graphics/Matrix.java
View File

@@ -179,7 +179,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = dy; mValues[5] = dy;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
} }
/** /**
@@ -200,7 +200,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = -py; mValues[5] = -py;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
// scale // scale
addTransform(new float[] { sx, 0, 0, 0, sy, 0, 0, 0, 1 }); addTransform(new float[] { sx, 0, 0, 0, sy, 0, 0, 0, 1 });
@@ -219,7 +219,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = 0; mValues[5] = 0;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
} }
/** /**
@@ -240,7 +240,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = -py; mValues[5] = -py;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
// scale // scale
double rad = Math.toRadians(degrees); double rad = Math.toRadians(degrees);
@@ -268,7 +268,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = 0; mValues[5] = 0;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
} }
/** /**
@@ -289,7 +289,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = -py; mValues[5] = -py;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
// scale // scale
addTransform(new float[] { cosValue, -sinValue, 0, sinValue, cosValue, 0, 0, 0, 1 }); addTransform(new float[] { cosValue, -sinValue, 0, sinValue, cosValue, 0, 0, 0, 1 });
@@ -308,7 +308,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = 0; mValues[5] = 0;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
} }
/** /**
@@ -329,7 +329,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = -py; mValues[5] = -py;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
// scale // scale
addTransform(new float[] { 1, kx, 0, ky, 1, 0, 0, 0, 1 }); addTransform(new float[] { 1, kx, 0, ky, 1, 0, 0, 0, 1 });
@@ -348,7 +348,7 @@ public class Matrix extends _Original_Matrix {
mValues[5] = 0; mValues[5] = 0;
mValues[6] = 0; mValues[6] = 0;
mValues[7] = 0; mValues[7] = 0;
mValues[7] = 1; mValues[8] = 1;
} }
/** /**