Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886" into jb-mr2-dev

This commit is contained in:
Romain Guy
2013-05-04 01:42:46 +00:00
committed by Android (Google) Code Review

View File

@ -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;
}