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

framebuffer_hd1: fix c/p error in 3fb3817563

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e83357964e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)

Origin message was:
------------------
- framebuffer_hd1: fix c/p error in 3fb3817563

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-28 13:15:20 +02:00
parent 3fb3817563
commit 8941a52ade
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver/fb_accel_cs_hd1.cpp
View File

@@ -278,6 +278,13 @@ void CFbAccelCSHD1::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint3
int xc, yc;
xc = (width > xRes) ? xRes : width;
yc = (height > yRes) ? yRes : height;
//NI
if (unscaled_w != 0 && (int)unscaled_w < xc)
xc = unscaled_w;
if (unscaled_h != 0 && (int)unscaled_h < yc)
yc = unscaled_h;
u32 cmd;
void *uKva;
@@ -306,12 +313,6 @@ void CFbAccelCSHD1::blitBox2FB(const fb_pixel_t* boxBuf, uint32_t width, uint32_
uint32_t xc = (width > xRes) ? (uint32_t)xRes : width;
uint32_t yc = (height > yRes) ? (uint32_t)yRes : height;
//NI
if (unscaled_w != 0 && (int)unscaled_w < xc)
xc = unscaled_w;
if (unscaled_h != 0 && (int)unscaled_h < yc)
yc = unscaled_h;
void* uKva = cs_phys_addr((void*)boxBuf);
if(uKva != NULL) {
OpenThreads::ScopedLock<OpenThreads::Mutex> m_lock(mutex);