git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some fontsize changes
[enigma2.git]
/
lib
/
gdi
/
gpixmap.cpp
diff --git
a/lib/gdi/gpixmap.cpp
b/lib/gdi/gpixmap.cpp
index 9e8219a5e588caeae6e11b6938722a9c38895ca1..f0f04d69237e618848ba27e69fa897dbebd98581 100644
(file)
--- a/
lib/gdi/gpixmap.cpp
+++ b/
lib/gdi/gpixmap.cpp
@@
-74,15
+74,8
@@
gSurfaceSystem::gSurfaceSystem(eSize size, int _bpp)
bypp=(bpp+7)/8;
}
stride=x*bypp;
bypp=(bpp+7)/8;
}
stride=x*bypp;
- if (bpp==8)
- {
- clut.colors=256;
- clut.data=new gRGB[clut.colors];
- } else
- {
- clut.colors=0;
- clut.data=0;
- }
+ clut.colors=0;
+ clut.data=0;
data=malloc(x*y*bypp);
}
data=malloc(x*y*bypp);
}
@@
-231,10
+224,9
@@
void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
void gPixmap::mergePalette(const gPixmap &target)
{
void gPixmap::mergePalette(const gPixmap &target)
{
- eDebug("merge palette! %p %p", surface, target.surface);
if ((!surface->clut.colors) || (!target.surface->clut.colors))
return;
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++)
@@
-255,7
+247,6
@@
void gPixmap::mergePalette(const gPixmap &target)
}
delete [] lookup;
}
delete [] lookup;
-#endif
}
static inline int sgn(int a)
}
static inline int sgn(int a)