mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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 
Origin commit data
------------------
Commit: f47b58c9db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)
This commit is contained in:
vanhofen
2017-03-23 15:17:28 +01:00
parent fba524e397 0ed64a8b8b
commit 8eaed748dd
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
data/cables.xml
View File

@@ -442,10 +442,10 @@
<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable> </cable>
<cable name="WTC SN" satfeed="true" flags="9"> <cable name="WTC SN" satfeed="true" flags="9">
<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -456,15 +456,21 @@
<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/> <transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -473,6 +479,11 @@
<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable> </cable>
<cable name="Goeltzschtalbruecke" satfeed="true" flags="9"> <cable name="Goeltzschtalbruecke" satfeed="true" flags="9">
<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/> <transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

7
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -170,7 +170,8 @@ bool CPictureViewer::DecodeImage (const std::string & _name, bool showBusySign,
m_NextPic_Buffer = NULL; m_NextPic_Buffer = NULL;
} }
size_t bufsize = x * y * 3; size_t bufsize = x * y * 3;
if (!checkfreemem(bufsize)){ size_t resizeBuf = (m_endx - m_startx) * (m_endy - m_starty)*3;
if (!checkfreemem(bufsize + resizeBuf)){
return false; return false;
} }
m_NextPic_Buffer = (unsigned char *) malloc (bufsize); m_NextPic_Buffer = (unsigned char *) malloc (bufsize);
@@ -885,8 +886,8 @@ bool CPictureViewer::checkfreemem(size_t bufsize)
{ {
struct sysinfo info; struct sysinfo info;
sysinfo( &info ); sysinfo( &info );
if(bufsize*2 + 4096 > (size_t)info.freeram + (size_t)info.freeswap){ if(bufsize + 4096 > (size_t)info.freeram + (size_t)info.freeswap){
dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Error: Out of memory\n", __func__, __LINE__); dprintf(DEBUG_NORMAL, "[CPictureViewer] [%s - %d] Error: Out of memory: need %zu > free %zu\n", __func__, __LINE__,bufsize,(size_t)info.freeram + (size_t)info.freeswap);
return false; return false;
} }
return true; return true;