diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/DisplayList.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp index b7d3d6fad1d5..3c587976d007 100644 --- a/libs/hwui/DisplayList.cpp +++ b/libs/hwui/DisplayList.cpp @@ -299,8 +299,8 @@ void DisplayList::updateMatrix() { if (mWidth != mPrevWidth || mHeight != mPrevHeight) { mPrevWidth = mWidth; mPrevHeight = mHeight; - mPivotX = mPrevWidth / 2; - mPivotY = mPrevHeight / 2; + mPivotX = mPrevWidth / 2.0f; + mPivotY = mPrevHeight / 2.0f; } } if ((mMatrixFlags & ROTATION_3D) == 0) { diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 6fc27714bda8..ddb190e3fec1 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -3535,7 +3535,7 @@ void OpenGLRenderer::getAlphaAndMode(SkPaint* paint, int* alpha, SkXfermode::Mod getAlphaAndModeDirect(paint, alpha, mode); if (mDrawModifiers.mOverrideLayerAlpha < 1.0f) { // if drawing a layer, ignore the paint's alpha - *alpha = mDrawModifiers.mOverrideLayerAlpha; + *alpha = mDrawModifiers.mOverrideLayerAlpha * 255; } *alpha *= mSnapshot->alpha; } |