From: Felix Domke <tmbinc@elitedvb.net>
Date: Wed, 10 May 2006 23:20:47 +0000 (+0000)
Subject: don't merge pixmaps when it's not required
X-Git-Tag: 2.6.0~3461
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/e9f1c31e51f2c2cb55bb01788242153eee3e7734?ds=sidebyside

don't merge pixmaps when it's not required
---

diff --git a/lib/gui/ewidgetdesktop.cpp b/lib/gui/ewidgetdesktop.cpp
index 9e092203..eaaa81c8 100644
--- a/lib/gui/ewidgetdesktop.cpp
+++ b/lib/gui/ewidgetdesktop.cpp
@@ -299,14 +299,17 @@ void eWidgetDesktop::makeCompatiblePixmap(gPixmap &pm)
 		return;
 	}
 
-	ePtr<gDC> pixmap_dc = new gDC(&pm);
-	gPainter pixmap_painter(pixmap_dc);
-	
 	ePtr<gPixmap> target_pixmap;
 	m_screen.m_dc->getPixmap(target_pixmap);
 	
 	assert(target_pixmap);
 	
+	if (target_pixmap->surface && target_pixmap->surface->bpp > 8)
+		return;
+
+	ePtr<gDC> pixmap_dc = new gDC(&pm);
+	gPainter pixmap_painter(pixmap_dc);
+	
 	pixmap_painter.mergePalette(target_pixmap);
 }