diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-03-17 15:51:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-17 15:51:38 -0700 |
| commit | 6764ba4482129e70d33fe0a7ff2579654b5da87a (patch) | |
| tree | 8a8b93aa74fd482dcb3feda33166a9d26791afbe /libs/rs/rsContext.cpp | |
| parent | 038094f93443d2aaf3d7831317f9f2487a4ef166 (diff) | |
| parent | 20a9354e52cb5cd22c38c7146efe37e1f9f690f3 (diff) | |
| download | frameworks_base-6764ba4482129e70d33fe0a7ff2579654b5da87a.zip frameworks_base-6764ba4482129e70d33fe0a7ff2579654b5da87a.tar.gz frameworks_base-6764ba4482129e70d33fe0a7ff2579654b5da87a.tar.bz2 | |
Merge "Fixing a small bug in debug output Default font wasn't reset for debug output but used the last font instead."
Diffstat (limited to 'libs/rs/rsContext.cpp')
| -rw-r--r-- | libs/rs/rsContext.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index c63d183..a7c0180 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -429,6 +429,8 @@ void Context::displayDebugStats() { mStateFont.getFontColor(&oldR, &oldG, &oldB, &oldA); uint32_t bufferLen = strlen(buffer); + ObjectBaseRef<Font> lastFont(getFont()); + setFont(NULL); float shadowCol = 0.1f; mStateFont.setFontColor(shadowCol, shadowCol, shadowCol, 1.0f); mStateFont.renderText(buffer, bufferLen, 5, getHeight() - 6); @@ -436,6 +438,7 @@ void Context::displayDebugStats() { mStateFont.setFontColor(1.0f, 0.7f, 0.0f, 1.0f); mStateFont.renderText(buffer, bufferLen, 4, getHeight() - 7); + setFont(lastFont.get()); mStateFont.setFontColor(oldR, oldG, oldB, oldA); } |