commit 031cfc8f3f390eef032494c3b4c05e5295277fc9
author Dan Stoza <stoza@google.com> Tue Nov 25 18:33:32 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 25 18:33:34 2014 +0000
tree 27d55fafc5a40b86bf764ee7b4bc693773044821
parent 642b4786357eedcf8a9b4043aa4852e6ef1ebdfc
parent 32d2e769ea6052aca2232c571a82ed7a7f8c996a

Merge "Cast buffer width and height to int"

libs/hwui/DeferredLayerUpdater.cpp

diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp
index d02455c..16d61fd 100644
--- a/libs/hwui/DeferredLayerUpdater.cpp
+++ b/libs/hwui/DeferredLayerUpdater.cpp
@@ -97,8 +97,8 @@
         sp<GraphicBuffer> buffer = mSurfaceTexture->getCurrentBuffer();
         if (buffer != NULL) {
             // force filtration if buffer size != layer size
-            forceFilter = mWidth != buffer->getWidth()
-                    || mHeight != buffer->getHeight();
+            forceFilter = mWidth != static_cast<int>(buffer->getWidth())
+                    || mHeight != static_cast<int>(buffer->getHeight());
         }
 
         #if DEBUG_RENDERER