From fabadea26c4e254d71e47d580a38c9b026a92f96 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Tue, 28 May 2013 13:01:52 +0200 Subject: [PATCH] Fix compile neutrino don't use USE_NEVIS_GXA Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2b03fd0ddc9a8ab14d51c891598032114b7e397e Author: Michael Liebmann Date: 2013-05-28 (Tue, 28 May 2013) Origin message was: ------------------ * Fix compile neutrino don't use USE_NEVIS_GXA ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/framebuffer.cpp | 10 +++------- src/driver/framebuffer.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 5029090a9..df56e51ea 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -758,6 +758,7 @@ void CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, const int #else int swidth = stride / sizeof(fb_pixel_t); fb_pixel_t *fbp = getFrameBufferPointer() + (swidth * y); + int line = 0; while (line < dy) { for (int pos = x; pos < x + dx; pos++) *(fbp + pos) = col; @@ -1745,7 +1746,7 @@ void * CFrameBuffer::convertRGBA2FB(unsigned char *rgbbuff, unsigned long x, uns return int_convertRGB2FB(rgbbuff, x, y, 0, true); } -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*/) { int xc, yc; @@ -1808,7 +1809,7 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32 d2 = (fb_pixel_t *) d; for (int count2 = 0; count2 < xc; count2++ ) { fb_pixel_t pix = *(pixpos + xp); - if (!transp || (pix & 0xff000000) == 0xff000000) + if ((pix & 0xff000000) == 0xff000000) *d2 = pix; else { uint8_t *in = (uint8_t *)(pixpos + xp); @@ -1825,11 +1826,6 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32 } d += stride; } -#if 0 - for(int i = 0; i < yc; i++){ - memmove(clfb + (i + yoff)*stride + xoff*4, ip + (i + yp)*width + xp, xc*4); - } -#endif } void CFrameBuffer::displayRGB(unsigned char *rgbbuff, int x_size, int y_size, int x_pan, int y_pan, int x_offs, int y_offs, bool clearfb, int transp) diff --git a/src/driver/framebuffer.h b/src/driver/framebuffer.h index 0c711fa49..16cf96179 100644 --- a/src/driver/framebuffer.h +++ b/src/driver/framebuffer.h @@ -237,7 +237,7 @@ class CFrameBuffer void add_gxa_sync_marker(void); void waitForIdle(const char* func=NULL); #else - inline void waitForIdle(void) {}; + inline void waitForIdle(const char*) {}; #endif void* convertRGB2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y, int transp = 0xFF); void* convertRGBA2FB(unsigned char *rgbbuff, unsigned long x, unsigned long y);