commit 5b20fd0882e6a1754cad7342f7ceda3753e8f567
author Jesse Hall <jessehall@google.com> Tue Mar 24 21:20:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 24 21:20:24 2015 +0000
tree ee0ff29eeebb7f8b8ccf557c98bbaa2c47d11776
parent f556fb1861230d732c11dfb9fbf34a352cdabc81
parent 28c03cca9835957f6e304b18358243b184fa46f8

am 28c03cca: am c2a5b469: am a527c07b: Merge "Fix mistake using width instead of height."

* commit '28c03cca9835957f6e304b18358243b184fa46f8':
  Fix mistake using width instead of height.

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index a560ca3..c931155 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3177,7 +3177,7 @@
     const int32_t hw_w = hw->getWidth();
     const int32_t hw_h = hw->getHeight();
     const bool filtering = static_cast<int32_t>(reqWidth) != hw_w ||
-                           static_cast<int32_t>(reqWidth) != hw_h;
+                           static_cast<int32_t>(reqHeight) != hw_h;
 
     // if a default or invalid sourceCrop is passed in, set reasonable values
     if (sourceCrop.width() == 0 || sourceCrop.height() == 0 ||