diff options
| author | Jesse Hall <jessehall@google.com> | 2015-03-24 21:06:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 21:06:56 +0000 |
| commit | 28c03cca9835957f6e304b18358243b184fa46f8 (patch) | |
| tree | 70d064d7f5257b3ed9ba2f0875b92baa60da16cc /services | |
| parent | a290b4b9121dab04c2989ab88017b8286075914b (diff) | |
| parent | c2a5b469a311891d8e3025aea0e4b348044dfaeb (diff) | |
| download | frameworks_native-28c03cca9835957f6e304b18358243b184fa46f8.zip frameworks_native-28c03cca9835957f6e304b18358243b184fa46f8.tar.gz frameworks_native-28c03cca9835957f6e304b18358243b184fa46f8.tar.bz2 | |
am c2a5b469: am a527c07b: Merge "Fix mistake using width instead of height."
* commit 'c2a5b469a311891d8e3025aea0e4b348044dfaeb':
Fix mistake using width instead of height.
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 7a1f243..9dc140e 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -3123,7 +3123,7 @@ void SurfaceFlinger::renderScreenImplLocked( 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 || |