git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
epgcache.cpp: fix segfault on unknown arg
[enigma2.git]
/
lib
/
gdi
/
grc.cpp
diff --git
a/lib/gdi/grc.cpp
b/lib/gdi/grc.cpp
index 5ef68332101906660ce4671310490d9a709e72c8..1f1b06a059cc6e7e4d4b416cbb1698d0c2622c80 100644
(file)
--- a/
lib/gdi/grc.cpp
+++ b/
lib/gdi/grc.cpp
@@
-330,6
+330,7
@@
void gPainter::renderPara(eTextPara *para, ePoint offset)
{
if ( m_dc->islocked() )
return;
{
if ( m_dc->islocked() )
return;
+ ASSERT(para);
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::renderPara;
o.dc = m_dc.grabRef();
@@
-409,6
+410,7
@@
void gPainter::setPalette(gRGB *colors, int start, int len)
{
if ( m_dc->islocked() )
return;
{
if ( m_dc->islocked() )
return;
+ ASSERT(colors);
gOpcode o;
o.opcode=gOpcode::setPalette;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode=gOpcode::setPalette;
o.dc = m_dc.grabRef();
@@
-434,6
+436,7
@@
void gPainter::mergePalette(gPixmap *target)
{
if ( m_dc->islocked() )
return;
{
if ( m_dc->islocked() )
return;
+ ASSERT(target);
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
gOpcode o;
o.opcode = gOpcode::mergePalette;
o.dc = m_dc.grabRef();
@@
-569,7
+572,7
@@
void gPainter::setCompositing(gCompositingData *comp)
m_rc->submit(o);
}
m_rc->submit(o);
}
-void gPainter::
end
()
+void gPainter::
flush
()
{
if ( m_dc->islocked() )
return;
{
if ( m_dc->islocked() )
return;
@@
-579,6
+582,12
@@
void gPainter::end()
m_rc->submit(o);
}
m_rc->submit(o);
}
+void gPainter::end()
+{
+ if ( m_dc->islocked() )
+ return;
+}
+
gDC::gDC()
{
m_spinner_pic = 0;
gDC::gDC()
{
m_spinner_pic = 0;