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

* commit 'c2a5b469a311891d8e3025aea0e4b348044dfaeb':
  Fix mistake using width instead of height.
This commit is contained in:
Jesse Hall 2015-03-24 21:06:56 +00:00 committed by Android Git Automerger
commit 28c03cca98

View File

@ -3123,7 +3123,7 @@ void SurfaceFlinger::renderScreenImplLocked(
const int32_t hw_w = hw->getWidth(); const int32_t hw_w = hw->getWidth();
const int32_t hw_h = hw->getHeight(); const int32_t hw_h = hw->getHeight();
const bool filtering = static_cast<int32_t>(reqWidth) != hw_w || 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 a default or invalid sourceCrop is passed in, set reasonable values
if (sourceCrop.width() == 0 || sourceCrop.height() == 0 || if (sourceCrop.width() == 0 || sourceCrop.height() == 0 ||