Merge branch 'master' into pu/msgbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b9d2542e6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
2016-10-28 08:05:34 +02:00
3 changed files with 5 additions and 3 deletions

View File

@@ -225,7 +225,7 @@ void CComponentsPicture::initCCItem()
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif
}
if (keep_dy_aspect & dx){
if (keep_dy_aspect && dx){
float w_ratio = float(width)*100/(float)dx;
height = int(w_ratio*(float)dy/100);
}