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

am b383438b: am a525483d: Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev

Browse Source 
* commit 'b383438b97643060e7ff5e737f0439418bd0ce3e':
  Fix a bug where non-cropped layer could be scaled incorrectly
This commit is contained in:
Mathias Agopian 2013-08-21 11:59:15 -07:00 committed by Android Git Automerger
commit 75860753bc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/surfaceflinger/Layer.cpp
View File

@ -287,7 +287,13 @@ FloatRect Layer::computeCrop(const sp<const DisplayDevice>& hw) const {
// pixels in the buffer. // pixels in the buffer.
// FIXME: the 3 lines below can produce slightly incorrect clipping when we have // FIXME: the 3 lines below can produce slightly incorrect clipping when we have
// a viewport clipping and a window transform. we should use floating point to fix this. // a viewport clipping and a window transform. we should use floating point to fix this.
Rect activeCrop(s.transform.transform(s.active.crop));
Rect activeCrop(s.active.w, s.active.h);
if (!s.active.crop.isEmpty()) {
activeCrop = s.active.crop;
}
activeCrop = s.transform.transform(activeCrop);
activeCrop.intersect(hw->getViewport(), &activeCrop); activeCrop.intersect(hw->getViewport(), &activeCrop);
activeCrop = s.transform.inverse().transform(activeCrop); activeCrop = s.transform.inverse().transform(activeCrop);