From: Felix Domke Date: Fri, 17 Oct 2003 17:21:15 +0000 (+0000) Subject: fix gPixmap ref, fix usage of gImage X-Git-Tag: 2.6.0~5979 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/0667332d1c91d29459f5fbdab667f54e47912da9 fix gPixmap ref, fix usage of gImage --- diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp index c089051d..e8ddcf73 100644 --- a/lib/gdi/gpixmap.cpp +++ b/lib/gdi/gpixmap.cpp @@ -246,7 +246,7 @@ gColor gPalette::findColor(const gRGB &rgb) const return best_choice; } -gPixmap::gPixmap() +gPixmap::gPixmap(): ref(0) { } diff --git a/lib/gui/eskin.cpp b/lib/gui/eskin.cpp index 6cb98abd..612a80ee 100644 --- a/lib/gui/eskin.cpp +++ b/lib/gui/eskin.cpp @@ -493,9 +493,6 @@ eSkin::~eSkin() for (std::map >::iterator it(images.begin()); it != images.end(); it++) delete it->second; - - if (paldummy) - delete paldummy; } int eSkin::load(const char *filename) diff --git a/lib/gui/eskin.h b/lib/gui/eskin.h index 0a6bd352..d28655af 100644 --- a/lib/gui/eskin.h +++ b/lib/gui/eskin.h @@ -40,7 +40,7 @@ class eSkin gRGB *palette; int maxcolors; - gImage *paldummy; + ePtr paldummy; int *colorused; static std::map< eString, tWidgetCreator > widget_creator;