diff options
| author | 2011-03-23 17:19:24 -0700 | |
|---|---|---|
| committer | 2011-03-23 17:19:24 -0700 | |
| commit | 9a9e8eefecf72f07bc0464900d47dea5c9904c6d (patch) | |
| tree | 8c5d5cd9b71782571dfbe9f1a950313c7c7e0ab2 /libs/hwui/OpenGLRenderer.cpp | |
| parent | 2a5fbcd6b123d5504b567e7c747b1055bb2d5ac3 (diff) | |
| parent | 5b7a3150a6dbf193b371854b66fa654937633d3a (diff) | |
Merge "Don't crash when omitting paint to drawBitmap() with A8 configs."
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 6c454a4f2b38..a5765482d425 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -1099,7 +1099,9 @@ void OpenGLRenderer::drawAlphaBitmap(Texture* texture, float left, float top, Sk setupDraw(); setupDrawWithTexture(true); - setupDrawAlpha8Color(paint->getColor(), alpha); + if (paint) { + setupDrawAlpha8Color(paint->getColor(), alpha); + } setupDrawColorFilter(); setupDrawShader(); setupDrawBlending(true, mode); |