mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CCDraw: rework getScreen(), getScreenData(), add pixbuf checks

Browse Source
This commit is contained in:
Thilo Graf
2017-06-15 01:01:55 +02:00
parent ecc1f4860c
commit 5fda283a61
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/components/cc_draw.cpp
View File

@@ -440,11 +440,13 @@ bool CCDraw::CheckFbData(const cc_fbdata_t& fbdata, const char* func, const int
//screen area save //screen area save
fb_pixel_t* CCDraw::getScreen(int ax, int ay, int dx, int dy) fb_pixel_t* CCDraw::getScreen(int ax, int ay, int dx, int dy)
{ {
fb_pixel_t* pixbuf = NULL;
if (dx < 1 || dy < 1 || dx * dy == 0) if (dx < 1 || dy < 1 || dx * dy == 0)
return NULL; return NULL;
else
pixbuf = new fb_pixel_t[dx * dy];
dprintf(DEBUG_INFO, "[CCDraw] INFO! [%s - %d], ax = %d, ay = %d, dx = %d, dy = %d\n", __func__, __LINE__, ax, ay, dx, dy);
fb_pixel_t* pixbuf = new fb_pixel_t[dx * dy];
frameBuffer->waitForIdle("CCDraw::getScreen()"); frameBuffer->waitForIdle("CCDraw::getScreen()");
frameBuffer->SaveScreen(ax, ay, dx, dy, pixbuf); frameBuffer->SaveScreen(ax, ay, dx, dy, pixbuf);
return pixbuf; return pixbuf;
@@ -453,8 +455,14 @@ fb_pixel_t* CCDraw::getScreen(int ax, int ay, int dx, int dy)
cc_screen_data_t CCDraw::getScreenData(const int& ax, const int& ay, const int& dx, const int& dy) cc_screen_data_t CCDraw::getScreenData(const int& ax, const int& ay, const int& dx, const int& dy)
{ {
cc_screen_data_t res; cc_screen_data_t res;
res.x = res.y = res.dx = res.dy = 0;
res.pixbuf = getScreen(ax, ay, dx, dy); res.pixbuf = getScreen(ax, ay, dx, dy);
res.x = ax; res.y = ay; res.dx = dx; res.dy = dy;
if (res.pixbuf){
res.x = ax; res.y = ay; res.dx = dx; res.dy = dy;
}
else
dprintf(DEBUG_NORMAL, "\033[33m[CCDraw]\[%s - %d], Warning: initialize of screen buffer failed!\033[0m\n", __func__, __LINE__);
return res; return res;
} }