mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/fb-setmode

Browse Source 
Fix merge conflict
This commit is contained in:
M. Liebmann
2017-02-14 20:11:08 +01:00
parent 56446c358f e8ec4540ca
commit 65f81b146d
9 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/fb_generic.cpp
View File

@@ -48,7 +48,6 @@
#include <gui/color.h>
#include <gui/pictureviewer.h>
#include <system/debug.h>
#include <system/helpers.h>
#include <global.h>
#include <video.h>
#include <cs_api.h>
@@ -527,7 +526,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
#ifdef BOXMODEL_CS_HD2
if (_dx%4 != 0) {
w_align = GetWidth4FB_HW_ACC(x, _dx, true);
w_align = getWidth4FB_HW_ACC(x, _dx, true);
if (w_align < _dx)
_dx = w_align;
offs_align = w_align - _dx;
@@ -1783,3 +1782,8 @@ bool CFrameBuffer::_checkFbArea(int _x, int _y, int _dx, int _dy, bool prev)
void CFrameBuffer::mark(int , int , int , int )
{
}
uint32_t CFrameBuffer::getWidth4FB_HW_ACC(const uint32_t /*x*/, const uint32_t w, const bool /*max*/)
{
return w;
}