diff options
| author | Dan Stoza <stoza@google.com> | 2015-06-10 18:08:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-10 18:08:31 +0000 |
| commit | d1adebc2daceaa11924101e01637110b06c0a7f2 (patch) | |
| tree | ec5a59905d4bbd3c04fccc242ac83c6732b7f62e /services | |
| parent | 04c664aa49e2634b61ef00daf34ebe7e31373b82 (diff) | |
| parent | 355950c1fc19c35c75203ea761882168f0980181 (diff) | |
| download | frameworks_native-d1adebc2daceaa11924101e01637110b06c0a7f2.zip frameworks_native-d1adebc2daceaa11924101e01637110b06c0a7f2.tar.gz frameworks_native-d1adebc2daceaa11924101e01637110b06c0a7f2.tar.bz2 | |
am 355950c1: am d177e044: Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
* commit '355950c1fc19c35c75203ea761882168f0980181':
SF: Swap w/h when capturing rotated screenshots
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 1388ce8..a426ad6 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -3320,8 +3320,12 @@ status_t SurfaceFlinger::captureScreenImplLocked( ATRACE_CALL(); // get screen geometry - const uint32_t hw_w = hw->getWidth(); - const uint32_t hw_h = hw->getHeight(); + uint32_t hw_w = hw->getWidth(); + uint32_t hw_h = hw->getHeight(); + + if (rotation & Transform::ROT_90) { + std::swap(hw_w, hw_h); + } if ((reqWidth > hw_w) || (reqHeight > hw_h)) { ALOGE("size mismatch (%d, %d) > (%d, %d)", |