ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"

Browse Source 
* commit '127cf2eff638a98c5318ba8b3edaf3ca651c4090':
  SF: Swap w/h when capturing rotated screenshots
This commit is contained in:
Dan Stoza 2015-06-10 18:21:55 +00:00 committed by Android Git Automerger
commit 430f5f5a62
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -3266,8 +3266,12 @@ status_t SurfaceFlinger::captureScreenImplLocked(
ATRACE_CALL(); ATRACE_CALL();
// get screen geometry // get screen geometry
const uint32_t hw_w = hw->getWidth(); uint32_t hw_w = hw->getWidth();
const uint32_t hw_h = hw->getHeight(); uint32_t hw_h = hw->getHeight();
if (rotation & Transform::ROT_90) {
std::swap(hw_w, hw_h);
}
if ((reqWidth > hw_w) || (reqHeight > hw_h)) { if ((reqWidth > hw_w) || (reqHeight > hw_h)) {
ALOGE("size mismatch (%d, %d) > (%d, %d)", ALOGE("size mismatch (%d, %d) > (%d, %d)",