From a2c70af4d68de977421b4259c8a73ad5ba3b11be Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 2 Feb 2020 14:48:00 +0100 Subject: [PATCH] fix move resized pic with pictureviewer --- src/driver/fb_generic.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp index 9734d3229..976e48132 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -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) { 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; 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); @@ -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(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);