diff options
| author | 2014-11-22 00:35:09 +0000 | |
|---|---|---|
| committer | 2014-11-22 00:35:09 +0000 | |
| commit | 64bb413a664001c95c8439cf097dc3033f4ed733 (patch) | |
| tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 /libs/hwui/FontRenderer.cpp | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
Diffstat (limited to 'libs/hwui/FontRenderer.cpp')
| -rw-r--r-- | libs/hwui/FontRenderer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 27ee0dcfcf77..5b5b09820670 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -47,7 +47,7 @@ namespace uirenderer { /////////////////////////////////////////////////////////////////////////////// // TextSetupFunctor /////////////////////////////////////////////////////////////////////////////// -status_t TextSetupFunctor::operator ()(int /* what */, void* data) { +status_t TextSetupFunctor::operator ()(int what, void* data) { Data* typedData = reinterpret_cast<Data*>(data); GLenum glyphFormat = typedData ? typedData->glyphFormat : GL_ALPHA; |