android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Overlay: Return error if crop values are invalid

Browse Source 
Return an error to the caller if input crop rectangle values are incorrect

Change-Id: Ie1bf9ac0dbcfba0becee0864b44903abd4016873
This commit is contained in:
Chetan Kalyan 2011-03-07 17:40:03 -08:00 committed by Govind Surti
parent 6ec5b1553f
commit 5fe46458a5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
liboverlay/overlayLib.cpp Normal file → Executable file
View File

@ -802,7 +802,10 @@ bool OverlayDataChannel::setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
}
if (ov.user_data[0] == MDP_ROT_90) {
int tmp = x;
if (ov.src.width < (y + h))
return false;
uint32_t tmp = x;
x = ov.src.width - (y + h);
y = tmp;
@ -811,7 +814,10 @@ bool OverlayDataChannel::setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
h = tmp;
}
else if (ov.user_data[0] == MDP_ROT_270) {
int tmp = y;
if (ov.src.height < (x + w))
return false;
uint32_t tmp = y;
y = ov.src.height - (x + w);
x = tmp;
@ -825,10 +831,6 @@ bool OverlayDataChannel::setCrop(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
(ov.src_rect.w == w) &&
(ov.src_rect.h == h))
return true;
if ( (int) x < 0 || (int) y < 0 || (int) w < 0 || (int) h < 0){
LOGE("%s: invalid value for crop: x=%d,y=%d,w=%d,h=%d",__func__,x,y,w,h);
return false;
}
ov.src_rect.x = x;
ov.src_rect.y = y;