git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
823e889
)
- reenable clut merging
author
Felix Domke
<tmbinc@elitedvb.net>
Fri, 20 May 2005 20:50:18 +0000
(20:50 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Fri, 20 May 2005 20:50:18 +0000
(20:50 +0000)
lib/gdi/gpixmap.cpp
patch
|
blob
|
history
diff --git
a/lib/gdi/gpixmap.cpp
b/lib/gdi/gpixmap.cpp
index 96a3e9b0ac4d4af2529333814a7c00b96ebf71a0..9bb59776b8e9973344b6eee6481de143280a99cc 100644
(file)
--- 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;
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++)
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;
}
delete [] lookup;
-#endif
}
static inline int sgn(int a)
}
static inline int sgn(int a)