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

am 65476e6b: Merge "Fix m11 to be Y scale instead of X" into jb-mr1-dev

Browse Source 
* commit '65476e6bd41208cba48386c9bf23c00b6e1560c6':
  Fix m11 to be Y scale instead of X
This commit is contained in:
Chris Craik
2012-09-06 17:02:42 -07:00
committed by Android Git Automerger
parent 399928df01 65476e6bd4
commit ebd4be019b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/OpenGLRenderer.cpp
View File

@@ -1760,7 +1760,7 @@ void OpenGLRenderer::drawAARect(float left, float top, float right, float bottom
float m00 = mat->data[Matrix4::kScaleX];
float m01 = mat->data[Matrix4::kSkewY];
float m10 = mat->data[Matrix4::kSkewX];
float m11 = mat->data[Matrix4::kScaleX];
float m11 = mat->data[Matrix4::kScaleY];
float scaleX = sqrt(m00 * m00 + m01 * m01);
float scaleY = sqrt(m10 * m10 + m11 * m11);
inverseScaleX = (scaleX != 0) ? (inverseScaleX / scaleX) : 0;
@@ -1896,7 +1896,7 @@ status_t OpenGLRenderer::drawLines(float* points, int count, SkPaint* paint) {
float m00 = mat->data[Matrix4::kScaleX];
float m01 = mat->data[Matrix4::kSkewY];
float m10 = mat->data[Matrix4::kSkewX];
float m11 = mat->data[Matrix4::kScaleX];
float m11 = mat->data[Matrix4::kScaleY];
float scaleX = sqrtf(m00 * m00 + m01 * m01);
float scaleY = sqrtf(m10 * m10 + m11 * m11);