don't crash when loadPNG fails

[enigma2.git] / lib / gui / epixmap.cpp

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index ca3e456275de817cebab05c99da3d227bd663d61..70ea9d6a7b099c950fd21ec49950ad139d4506ed 100644 (file)
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -2,10 +2,17 @@
 #include <lib/gdi/epng.h>
 #include <lib/gui/ewidgetdesktop.h>
 
-ePixmap::ePixmap(eWidget *parent): eWidget(parent)
+ePixmap::ePixmap(eWidget *parent)
+       :eWidget(parent), m_alphatest(false)
 {
 }
 
+void ePixmap::setAlphatest(bool alphatest)
+{
+       m_alphatest = alphatest;
+       setTransparent(alphatest);
+}
+
 void ePixmap::setPixmap(gPixmap *pixmap)
 {
        m_pixmap = pixmap;
@@ -14,12 +21,14 @@ void ePixmap::setPixmap(gPixmap *pixmap)
 
 void ePixmap::setPixmapFromFile(const char *filename)
 {
-       // use direct filename for absolute path or relative to enigma2 DATADIR otherwise
-       if (filename[0] == '/')
-               loadPNG(m_pixmap, filename);
-       else
-               loadPNG(m_pixmap, strcat(DATADIR "/enigma2/", filename));
-               
+       loadPNG(m_pixmap, filename);
+       
+       if (!m_pixmap)
+       {
+               eDebug("ePixmap::setPixmapFromFile: loadPNG failed");
+               return;
+       }
+       
                // TODO
        getDesktop()->makeCompatiblePixmap(*m_pixmap);
        event(evtChangedPixmap);
@@ -39,7 +48,7 @@ int ePixmap::event(int event, void *data, void *data2)
                
                gPainter &painter = *(gPainter*)data2;
                if (m_pixmap)
-                       painter.blit(m_pixmap, ePoint(0, 0));
+                       painter.blit(m_pixmap, ePoint(0, 0), eRect(), m_alphatest?gPainter::BT_ALPHATEST:0);
                
                return 0;
        }