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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)
This commit is contained in:
vanhofen
2017-08-08 15:54:12 +02:00
parent e21f270c04 22fdfc0484
commit a0f5a94440
21 changed files with 256 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/driver/fb_generic.cpp
View File

@@ -207,21 +207,9 @@ nolfb:
lbb = lfb = NULL;
}
void CFrameBuffer::clearIconCache()
{
std::map<std::string, rawIcon>::iterator it;
for(it = icon_cache.begin(); it != icon_cache.end(); ++it) {
/* printf("FB: delete cached icon %s: %x\n", it->first.c_str(), (int) it->second.data); */
cs_free_uncached(it->second.data);
}
icon_cache.clear();
}
CFrameBuffer::~CFrameBuffer()
{
clearIconCache(); //NI
clearIconCache();
if (background) {
delete[] background;
@@ -926,6 +914,17 @@ _display:
return true;
}
void CFrameBuffer::clearIconCache()
{
std::map<std::string, rawIcon>::iterator it;
for(it = icon_cache.begin(); it != icon_cache.end(); ++it) {
/* printf("FB: delete cached icon %s: %x\n", it->first.c_str(), (int) it->second.data); */
cs_free_uncached(it->second.data);
}
icon_cache.clear();
}
void CFrameBuffer::loadPal(const std::string & filename, const unsigned char offset, const unsigned char endidx)
{
if (!getActive())