diff options
| author | 2014-11-10 20:54:07 -0800 | |
|---|---|---|
| committer | 2014-11-10 21:29:52 -0800 | |
| commit | edaecc1db0584fa017822dfc2da0c968b53967e6 (patch) | |
| tree | dc2db79f490bc2e334c6e3688e099c98e846f381 /libs/hwui/PathCache.cpp | |
| parent | baa73b056cbd4627a84b39a6267065ae56677220 (diff) | |
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
Diffstat (limited to 'libs/hwui/PathCache.cpp')
| -rw-r--r-- | libs/hwui/PathCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/PathCache.cpp b/libs/hwui/PathCache.cpp index 9ba885496f6f..a3d70197cb0f 100644 --- a/libs/hwui/PathCache.cpp +++ b/libs/hwui/PathCache.cpp @@ -212,7 +212,7 @@ void PathCache::removeTexture(PathTexture* texture) { // before attempting our cleanup const sp<Task<SkBitmap*> >& task = texture->task(); if (task != NULL) { - SkBitmap* bitmap = task->getResult(); + task->getResult(); texture->clearTask(); } else { // If there is a pending task, the path was not added |