aboutsummaryrefslogtreecommitdiff
path: root/lib/gdi/gpixmap.cpp
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2005-05-20 20:50:18 +0000
committerFelix Domke <tmbinc@elitedvb.net>2005-05-20 20:50:18 +0000
commit8eb03b9a607269d101bf67c7734cf3fb5346ccf5 (patch)
tree354d67e4bba2676075ce9cc028713345657166e7 /lib/gdi/gpixmap.cpp
parent823e8897d98c90e114bf68c9af754c72fdd9d411 (diff)
downloadenigma2-8eb03b9a607269d101bf67c7734cf3fb5346ccf5.tar.gz
enigma2-8eb03b9a607269d101bf67c7734cf3fb5346ccf5.zip
- reenable clut merging
Diffstat (limited to 'lib/gdi/gpixmap.cpp')
-rw-r--r--lib/gdi/gpixmap.cpp3
1 files changed, 1 insertions, 2 deletions
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)