mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix move resized pic with pictureviewer

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-02-02 14:48:00 +01:00
parent f6bdc07f84
commit a2c70af4d6
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

@@ -1794,8 +1794,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) 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 xc, yc; uint32_t xc, yc;
xc = (width > xRes) ? xRes : width; xc = (width > xRes) ? xRes + xp : width;
yc = (height > yRes) ? yRes : height; yc = (height > yRes) ? yRes + yp: height;
if (xp >= xc || yp >= yc) { if (xp >= xc || yp >= yc) {
printf(LOGTAG "%s: invalid parameters, xc: %u <= xp: %u or yc: %u <= yp: %u\n", __func__, xc, xp, yc, yp); printf(LOGTAG "%s: invalid parameters, xc: %u <= xp: %u or yc: %u <= yp: %u\n", __func__, xc, xp, yc, yp);
@@ -1887,9 +1887,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(x_pan > x_size - (int)xRes) x_pan = 0;
if(y_pan > y_size - (int)yRes) y_pan = 0; if(y_pan > y_size - (int)yRes) y_pan = 0;
#if 0
/* correct offset */ /* correct offset */
/* this break move zoomed pic with pictureviewer */
if(x_offs + x_size > (int)xRes) x_offs = 0; if(x_offs + x_size > (int)xRes) x_offs = 0;
if(y_offs + y_size > (int)yRes) y_offs = 0; if(y_offs + y_size > (int)yRes) y_offs = 0;
#endif
/* blit buffer 2 fb */ /* blit buffer 2 fb */
fbbuff = convertRGB2FB(rgbbuff, x_size, y_size, transp); fbbuff = convertRGB2FB(rgbbuff, x_size, y_size, transp);