aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2003-10-17 17:21:15 +0000
committerFelix Domke <tmbinc@elitedvb.net>2003-10-17 17:21:15 +0000
commit0667332d1c91d29459f5fbdab667f54e47912da9 (patch)
treea5af7ce11c03e5bf07c7288485336bed7c0f14fc
parent8f64fddf07fe3c0bb4d13f975396313b9e62c4a1 (diff)
downloadenigma2-0667332d1c91d29459f5fbdab667f54e47912da9.tar.gz
enigma2-0667332d1c91d29459f5fbdab667f54e47912da9.zip
fix gPixmap ref, fix usage of gImage
-rw-r--r--lib/gdi/gpixmap.cpp2
-rw-r--r--lib/gui/eskin.cpp3
-rw-r--r--lib/gui/eskin.h2
3 files changed, 2 insertions, 5 deletions
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<eString, ePtr<gPixmap> >::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<gImage> paldummy;
int *colorused;
static std::map< eString, tWidgetCreator > widget_creator;