From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 20 May 2005 20:50:18 +0000 (+0000)
Subject:  - reenable clut merging
X-Git-Tag: 2.6.0~5826
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/8eb03b9a607269d101bf67c7734cf3fb5346ccf5

 - reenable clut merging
---

diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp
index 96a3e9b0..9bb59776 100644
--- a/lib/gdi/gpixmap.cpp
+++ b/lib/gdi/gpixmap.cpp
@@ -227,7 +227,7 @@ void gPixmap::mergePalette(const gPixmap &target)
 	eDebug("merge palette! %p %p", surface, target.surface);
 	if ((!surface->clut.colors) || (!target.surface->clut.colors))
 		return;
-#if 0
+
 	gColor *lookup=new gColor[surface->clut.colors];
 
 	for (int i=0; i<surface->clut.colors; i++)
@@ -248,7 +248,6 @@ void gPixmap::mergePalette(const gPixmap &target)
 	}
 	
 	delete [] lookup;
-#endif
 }
 
 static inline int sgn(int a)