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

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/driver/framebuffer_ng.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd0237039d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-02 13:12:54 +01:00
parent 659e55fd39 1b5fc6b12f
commit f7ad8c74e7
7 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/framebuffer_ng.cpp
View File

@@ -624,8 +624,8 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
fb_pixel_t *bp = boxBuf;
fb_pixel_t *gra = gradientData->gradientBuf;
gradientData->boxBuf = boxBuf;
gradientData->x = x - offs_align;
gradientData->dx = w_align;
gradientData->x = x;
gradientData->dx = dx;
if (gradientData->direction == gradientVertical) {
// vertical