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

Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	acinclude.m4
	src/neutrino.cpp


Origin commit data
------------------
Commit: 7f989a3625
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-31 (Fri, 31 Mar 2017)
This commit is contained in:
vanhofen
2017-03-31 17:47:29 +02:00
parent 7a1f383789 3496122f93
commit ff7fc4971a
3 changed files with 82 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/fb_generic.cpp
View File

@@ -820,6 +820,7 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
return false;
int yy = y;
bool freeicondata = false;
//printf("CFrameBuffer::paintIcon: load %s\n", filename.c_str());fflush(stdout);
/* we cache and check original name */
@@ -904,6 +905,8 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
cache_size += dsize;
icon_cache.insert(std::pair <std::string, rawIcon> (filename, tmpIcon));
//printf("Cached %s, cache size %d\n", newname.c_str(), cache_size);
}else{
freeicondata = true;
}
} else {
data = it->second.data;
@@ -912,9 +915,13 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
//printf("paintIcon: already cached %s %d x %d\n", newname.c_str(), width, height);
}
_display:
if(!paint)
if(!paint){
if(freeicondata){
free(data);
data = NULL;
}
return true;
}
if (h != 0)
yy += (h - height) / 2;
@@ -1383,7 +1390,7 @@ void CFrameBuffer::useBackground(bool ub)
useBackgroundPaint = ub;
if(!useBackgroundPaint) {
delete[] background;
background=0;
background=NULL;
}
}
@@ -1406,10 +1413,11 @@ void CFrameBuffer::saveBackgroundImage(void)
void CFrameBuffer::restoreBackgroundImage(void)
{
fb_pixel_t * tmp = background;
fb_pixel_t * tmp = NULL;
if (backupBackground != NULL)
{
tmp = background;
background = backupBackground;
backupBackground = NULL;
}