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

fix move resized pic with pictureviewer

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7db30db31e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2020-02-02 (Sun, 02 Feb 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2020-02-02 21:26:36 +01:00
committed by vanhofen
parent 9b9f228630
commit d775876757
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/fb_generic.cpp
View File

@@ -1786,8 +1786,8 @@ void CFrameBuffer::fbCopyArea(uint32_t width, uint32_t height, uint32_t dst_x, u
void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool transp, uint32_t unscaled_w, uint32_t unscaled_h) //NI
{
uint32_t xc, yc;
xc = (width > xRes) ? xRes : width;
yc = (height > yRes) ? yRes : height;
xc = (width > xRes) ? xRes + xp : width;
yc = (height > yRes) ? yRes + yp: height;
//NI
if (unscaled_w != 0 && unscaled_w < xc)
@@ -1885,9 +1885,12 @@ void CFrameBuffer::displayRGB(unsigned char *rgbbuff, int x_size, int y_size, in
if(x_pan > x_size - (int)xRes) x_pan = 0;
if(y_pan > y_size - (int)yRes) y_pan = 0;
#if 0
/* correct offset */
/* this break move zoomed pic with pictureviewer */
if(x_offs + x_size > (int)xRes) x_offs = 0;
if(y_offs + y_size > (int)yRes) y_offs = 0;
#endif
/* blit buffer 2 fb */
fbbuff = convertRGB2FB(rgbbuff, x_size, y_size, transp);