mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7381ad2a19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-26 (Thu, 26 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-05-26 13:36:13 +02:00
parent 53c6877275 7764d30ea3
commit d8720d18a6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_draw.cpp
View File

@@ -431,7 +431,7 @@ bool CCDraw::CheckFbData(const cc_fbdata_t& fbdata, const char* func, const int
//screen area save
fb_pixel_t* CCDraw::getScreen(int ax, int ay, int dx, int dy)
{
if (dx * dy == 0)
if (dx < 1 || dy < 1 || dx * dy == 0)
return NULL;
dprintf(DEBUG_INFO, "[CCDraw] INFO! [%s - %d], ax = %d, ay = %d, dx = %d, dy = %d\n", __func__, __LINE__, ax, ay, dx, dy);

4
src/gui/components/cc_item_picture.cpp
View File

@@ -216,7 +216,7 @@ void CComponentsPicture::initCCItem()
* by setters setWidth/setHeight
* these steps are required to assign the current image dimensions to item dimensions
*/
if (keep_dx_aspect){
if (keep_dx_aspect && dy){
float h_ratio = float(height)*100/(float)dy;
width = int(h_ratio*(float)dx/100);
#ifdef BOXMODEL_APOLLO
@@ -224,7 +224,7 @@ void CComponentsPicture::initCCItem()
width = GetWidth4FB_HW_ACC(x+fr_thickness, width-2*fr_thickness)+2*fr_thickness;
#endif
}
if (keep_dy_aspect){
if (keep_dy_aspect & dx){
float w_ratio = float(width)*100/(float)dx;
height = int(w_ratio*(float)dy/100);
}