diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-03-07 01:13:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-07 01:13:50 +0000 |
| commit | 7830c81cd29a35476cae2543fd0e4c8dc3491194 (patch) | |
| tree | d735903c53f4cbcdb3509f4737f92a7b0e7d571b /libs | |
| parent | 0e24f143edd81de6ca5a4ed998e26fbb78c5db28 (diff) | |
| parent | 9ad6ac08a95d48772dcaad67a55446299bda77a9 (diff) | |
| download | frameworks_base-7830c81cd29a35476cae2543fd0e4c8dc3491194.zip frameworks_base-7830c81cd29a35476cae2543fd0e4c8dc3491194.tar.gz frameworks_base-7830c81cd29a35476cae2543fd0e4c8dc3491194.tar.bz2 | |
Merge "Fix unused local variale warning from clang/llvm."
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 7fd115f..a6f6e18 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2845,8 +2845,6 @@ void OpenGLRenderer::drawPosText(const char* text, int bytesCount, int count, const Rect& clip(pureTranslate ? writableSnapshot()->getClipRect() : writableSnapshot()->getLocalClip()); Rect bounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f); - const bool hasActiveLayer = hasLayer(); - TextSetupFunctor functor(this, x, y, pureTranslate, alpha, mode, paint); if (fontRenderer.renderPosText(paint, &clip, text, 0, bytesCount, count, x, y, positions, hasLayer() ? &bounds : nullptr, &functor)) { @@ -3046,10 +3044,8 @@ void OpenGLRenderer::drawTextOnPath(const char* text, int bytesCount, int count, const Rect* clip = &writableSnapshot()->getLocalClip(); Rect bounds(FLT_MAX / 2.0f, FLT_MAX / 2.0f, FLT_MIN / 2.0f, FLT_MIN / 2.0f); - const bool hasActiveLayer = hasLayer(); - if (fontRenderer.renderTextOnPath(paint, clip, text, 0, bytesCount, count, path, - hOffset, vOffset, hasActiveLayer ? &bounds : nullptr, &functor)) { + hOffset, vOffset, hasLayer() ? &bounds : nullptr, &functor)) { dirtyLayer(bounds.left, bounds.top, bounds.right, bounds.bottom, *currentTransform()); mDirty = true; } |