mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix build; try to port our framebuffer changes (need fixes!)

Browse Source 
Origin commit data
------------------
Commit: fa727d1bff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)

Origin message was:
------------------
- fix build; try to port our framebuffer changes (need fixes!)
This commit is contained in:
vanhofen
2017-02-08 09:45:53 +01:00
parent 0707fef642
commit b2210d8a75
9 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/fb_generic.cpp
View File

@@ -253,7 +253,7 @@ nolfb:
}
CFrameBuffer::~CFrameBuffer()
void CFrameBuffer::clearIconCache()
{
std::map<std::string, rawIcon>::iterator it;
@@ -262,6 +262,11 @@ CFrameBuffer::~CFrameBuffer()
cs_free_uncached(it->second.data);
}
icon_cache.clear();
}
CFrameBuffer::~CFrameBuffer()
{
clearIconCache(); //NI
if (background) {
delete[] background;
@@ -1677,13 +1682,22 @@ void * CFrameBuffer::convertRGBA2FB(unsigned char *rgbbuff, unsigned long x, uns
return int_convertRGB2FB(rgbbuff, x, y, 0, true);
}
void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool /*transp*/)
void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool /*transp*/, uint32_t unscaled_w, uint32_t unscaled_h) //NI
{
int xc, yc;
xc = (width > xRes) ? xRes : width;
yc = (height > yRes) ? yRes : height;
//FIXME
#if 0
//NI
if(unscaled_w != 0 && (int)unscaled_w < xc)
xc = unscaled_w;
if(unscaled_h != 0 && (int)unscaled_h < yc)
yc = unscaled_h;
#endif
fb_pixel_t* data = (fb_pixel_t *) fbbuff;
uint8_t * d = ((uint8_t *)getFrameBufferPointer()) + xoff * sizeof(fb_pixel_t) + stride * yoff;