diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-06-23 01:05:14 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-06-23 01:05:14 +0200 |
| commit | 5960b0d3e89264496a44e21f84da1e057905df53 (patch) | |
| tree | 3ca2028f746ee5b1c093cccc9b834a1a3580fb0b /lib/gdi/gpixmap.cpp | |
| parent | 72ea8cbfab4454adee8aebab4258d054f3e8f32c (diff) | |
| parent | 88bae399660a892a61882f59251d9359750d3d3b (diff) | |
| download | enigma2-5960b0d3e89264496a44e21f84da1e057905df53.tar.gz enigma2-5960b0d3e89264496a44e21f84da1e057905df53.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/gdi/gpixmap.cpp')
| -rw-r--r-- | lib/gdi/gpixmap.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp index 6f741d85..3e643108 100644 --- a/lib/gdi/gpixmap.cpp +++ b/lib/gdi/gpixmap.cpp @@ -98,8 +98,12 @@ gSurface::gSurface(eSize size, int _bpp, int accel) stride += 63; stride &=~63; + int pal_size = 0; + if (bpp == 8) + pal_size = 256 * 4; + if (gAccel::getInstance()) - eDebug("accel memory: %d", gAccel::getInstance()->accelAlloc(data, data_phys, y * stride)); + eDebug("accel memory: %d", gAccel::getInstance()->accelAlloc(data, data_phys, y * stride + pal_size)); else eDebug("no accel available"); } @@ -143,7 +147,7 @@ void gPixmap::fill(const gRegion ®ion, const gColor &color) for (i=0; i<region.rects.size(); ++i) { const eRect &area = region.rects[i]; - if ((area.height()<=0) || (area.width()<=0)) + if (area.empty()) continue; if (surface->bpp == 8) @@ -159,8 +163,8 @@ void gPixmap::fill(const gRegion ®ion, const gColor &color) else col=0x10101*color; - col^=0xFF000000; - + col^=0xFF000000; + if (surface->data_phys && gAccel::getInstance()) if (!gAccel::getInstance()->fill(surface, area, col)) continue; @@ -183,7 +187,7 @@ void gPixmap::fill(const gRegion ®ion, const gRGB &color) for (i=0; i<region.rects.size(); ++i) { const eRect &area = region.rects[i]; - if ((area.height()<=0) || (area.width()<=0)) + if (area.empty()) continue; if (surface->bpp == 32) @@ -292,7 +296,7 @@ void gPixmap::blit(const gPixmap &src, const eRect &_pos, const gRegion &clip, i area&=clip.rects[i]; area&=eRect(ePoint(0, 0), size()); - if ((area.width()<0) || (area.height()<0)) + if (area.empty()) continue; eRect srcarea = area; |