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 /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0e452856a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-13 09:42:27 +02:00
parent 1afef53db4 2dc2849d4a
commit 94ec70d307
4 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/framebuffer.cpp
View File

@@ -825,7 +825,7 @@ 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", __func__, __LINE__, radius, x, y, x+dx, y+dy);
dprintf(DEBUG_DEBUG, "[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)