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

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

Browse Source
This commit is contained in:
Chris Craik
2012-09-06 17:00:58 -07:00
committed by Android (Google) Code Review
parent 06efb530a4 9147cd4ac5
commit 65476e6bd4
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 m00 = mat->data[Matrix4::kScaleX];
float m01 = mat->data[Matrix4::kSkewY]; float m01 = mat->data[Matrix4::kSkewY];
float m10 = mat->data[Matrix4::kSkewX]; 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 scaleX = sqrt(m00 * m00 + m01 * m01);
float scaleY = sqrt(m10 * m10 + m11 * m11); float scaleY = sqrt(m10 * m10 + m11 * m11);
inverseScaleX = (scaleX != 0) ? (inverseScaleX / scaleX) : 0; 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 m00 = mat->data[Matrix4::kScaleX];
float m01 = mat->data[Matrix4::kSkewY]; float m01 = mat->data[Matrix4::kSkewY];
float m10 = mat->data[Matrix4::kSkewX]; 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 scaleX = sqrtf(m00 * m00 + m01 * m01);
float scaleY = sqrtf(m10 * m10 + m11 * m11); float scaleY = sqrtf(m10 * m10 + m11 * m11);