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/DeferredLayerUpdater.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/DeferredLayerUpdater.cpp')
-rw-r--r-- | libs/hwui/DeferredLayerUpdater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp index 16d61fd37824..d02455c8fc1d 100644 --- a/libs/hwui/DeferredLayerUpdater.cpp +++ b/libs/hwui/DeferredLayerUpdater.cpp @@ -97,8 +97,8 @@ void DeferredLayerUpdater::doUpdateTexImage() { sp<GraphicBuffer> buffer = mSurfaceTexture->getCurrentBuffer(); if (buffer != NULL) { // force filtration if buffer size != layer size - forceFilter = mWidth != static_cast<int>(buffer->getWidth()) - || mHeight != static_cast<int>(buffer->getHeight()); + forceFilter = mWidth != buffer->getWidth() + || mHeight != buffer->getHeight(); } #if DEBUG_RENDERER |