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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 22ef37ae12
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-01 (Thu, 01 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-01 08:50:59 +02:00
parent 44fbdbfc3e bd1cc4cbed
commit 6c6f75e670
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/framebuffer.cpp
View File

@@ -825,9 +825,11 @@ void CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, const int
return;
if (dx == 0 || dy == 0) {
//NI dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: radius %d, start x %d y %d end x %d y %d\n", __FUNCTION__, __LINE__, radius, x, y, x+dx, y+dy);
//NI dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: radius %d, start x %d y %d end x %d y %d\n", __func__, __LINE__, radius, x, y, x+dx, y+dy);
return;
}
if (radius < 0)
dprintf(DEBUG_NORMAL, "[CFrameBuffer] [%s - %d]: WARNING! radius < 0 [%d] FIXME\n", __func__, __LINE__, radius);
checkFbArea(x, y, dx, dy, true);