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

Merge branch 'master' into pu/fb-setmode

Browse Source 
Fix merge conflict


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-14 20:11:08 +01:00
parent ed768d2c33 c940801136
commit 78a5a4a658
9 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/driver/fb_accel_cs_hd2.cpp
View File

@@ -299,3 +299,20 @@ bool CFbAccelCSHD2::fullHdAvailable()
return true;
return false;
}
/* align for hw blit */
uint32_t CFbAccelCSHD2::getWidth4FB_HW_ACC(const uint32_t _x, const uint32_t _w, const bool max)
{
uint32_t ret = _w;
if ((_x + ret) >= xRes)
ret = xRes-_x-1;
if (ret%4 == 0)
return ret;
int add = (max) ? 3 : 0;
ret = ((ret + add) / 4) * 4;
if ((_x + ret) >= xRes)
ret -= 4;
return ret;
}