git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- remove debug message
[enigma2.git]
/
lib
/
gdi
/
gpixmap.cpp
diff --git
a/lib/gdi/gpixmap.cpp
b/lib/gdi/gpixmap.cpp
index fe0c0a1f41c34ef9764667c941ba0861c761e3a0..9e8219a5e588caeae6e11b6938722a9c38895ca1 100644
(file)
--- a/
lib/gdi/gpixmap.cpp
+++ b/
lib/gdi/gpixmap.cpp
@@
-139,9
+139,9
@@
void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
{
for (unsigned int i=0; i<clip.rects.size(); ++i)
{
{
for (unsigned int i=0; i<clip.rects.size(); ++i)
{
- eRect area=eRect(pos, src.
getS
ize());
+ eRect area=eRect(pos, src.
s
ize());
area&=clip.rects[i];
area&=clip.rects[i];
- area&=eRect(ePoint(0, 0),
getS
ize());
+ area&=eRect(ePoint(0, 0),
s
ize());
if ((area.width()<0) || (area.height()<0))
continue;
if ((area.width()<0) || (area.height()<0))
continue;
@@
-153,7
+153,7
@@
void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
__u8 *srcptr=(__u8*)src.surface->data;
__u8 *dstptr=(__u8*)surface->data;
__u8 *srcptr=(__u8*)src.surface->data;
__u8 *dstptr=(__u8*)surface->data;
- srcptr+=srcarea.left()*surface->bypp+srcarea.top()*src.surface->stride;
+ srcptr+=srcarea.left()*s
rc.s
urface->bypp+srcarea.top()*src.surface->stride;
dstptr+=area.left()*surface->bypp+area.top()*surface->stride;
for (int y=0; y<area.height(); y++)
{
dstptr+=area.left()*surface->bypp+area.top()*surface->stride;
for (int y=0; y<area.height(); y++)
{
@@
-193,7
+193,7
@@
void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
pal[i]^=0xFF000000;
}
pal[i]^=0xFF000000;
}
- srcptr+=srcarea.left()*surface->bypp+srcarea.top()*src.surface->stride;
+ srcptr+=srcarea.left()*s
rc.s
urface->bypp+srcarea.top()*src.surface->stride;
dstptr+=area.left()*surface->bypp+area.top()*surface->stride;
for (int y=0; y<area.height(); y++)
{
dstptr+=area.left()*surface->bypp+area.top()*surface->stride;
for (int y=0; y<area.height(); y++)
{
@@
-231,8
+231,10
@@
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++)
@@
-253,6
+255,7
@@
void gPixmap::mergePalette(const gPixmap &target)
}
delete [] lookup;
}
delete [] lookup;
+#endif
}
static inline int sgn(int a)
}
static inline int sgn(int a)
@@
-385,6
+388,8
@@
gColor gPalette::findColor(const gRGB &rgb) const
ttd+=td;
if (ttd>=difference)
continue;
ttd+=td;
if (ttd>=difference)
continue;
+ if (!ttd)
+ return t;
difference=ttd;
best_choice=t;
}
difference=ttd;
best_choice=t;
}