From 63a9a75a8ff57bda1cbf150710ec8a0e47cc338f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 24 Mar 2013 19:22:49 +0100 Subject: [PATCH] fb_ng: silence some compiler warnings Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/9543dfff64c5e827fcd6c20a8cd6be764994d398 Author: Stefan Seyfried Date: 2013-03-24 (Sun, 24 Mar 2013) --- src/driver/fbaccel.cpp | 7 ++++--- src/driver/framebuffer_ng.cpp | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/driver/fbaccel.cpp b/src/driver/fbaccel.cpp index d29e9b523..ba1a52786 100644 --- a/src/driver/fbaccel.cpp +++ b/src/driver/fbaccel.cpp @@ -538,12 +538,13 @@ void CFbAccel::paintLine(int xa, int ya, int xb, int yb, const fb_pixel_t col) #if !HAVE_TRIPLEDRAGON void CFbAccel::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t xoff, uint32_t yoff, uint32_t xp, uint32_t yp, bool transp) { +#if !HAVE_SPARK_HARDWARE int xc, yc; - xc = (width > fb->xRes) ? fb->xRes : width; yc = (height > fb->yRes) ? fb->yRes : height; - +#endif #ifdef USE_NEVIS_GXA + (void)transp; u32 cmd; void *uKva; @@ -611,7 +612,7 @@ void CFbAccel::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t x #else fb_pixel_t *data = (fb_pixel_t *) fbbuff; - uint8_t *d = ((uint8_t *)fb->getFrameBufferPointer()) + xoff * sizeof(fb_pixel_t) + fb->stride * yoff; + uint8_t *d = (uint8_t *)lbb + xoff * sizeof(fb_pixel_t) + fb->stride * yoff; fb_pixel_t * d2; for (int count = 0; count < yc; count++ ) { diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp index f10558487..6d0c980f6 100644 --- a/src/driver/framebuffer_ng.cpp +++ b/src/driver/framebuffer_ng.cpp @@ -146,6 +146,7 @@ void CFrameBuffer::init(const char * const fbDevice) int tr = 0xFF; #ifdef USE_OPENGL + (void)fbDevice; fd = -1; if(!mpGLThreadObj) { @@ -171,6 +172,8 @@ void CFrameBuffer::init(const char * const fbDevice) mpGLThreadObj->Start(); mpGLThreadObj->waitInit(); } + else + goto nolfb; } lfb = reinterpret_cast(mpGLThreadObj->getOSDBuffer()); memset(lfb, 0x7f, screeninfo.xres * screeninfo.yres * 4); @@ -445,6 +448,7 @@ void CFrameBuffer::setTransparency( int /*tr*/ ) #if !HAVE_TRIPLEDRAGON void CFrameBuffer::setBlendMode(uint8_t mode) { + (void)mode; #ifdef HAVE_COOL_HARDWARE if (ioctl(fd, FBIO_SETBLENDMODE, mode)) printf("FBIO_SETBLENDMODE failed.\n"); @@ -453,6 +457,7 @@ void CFrameBuffer::setBlendMode(uint8_t mode) void CFrameBuffer::setBlendLevel(int level) { + (void)level; #ifdef HAVE_COOL_HARDWARE //printf("CFrameBuffer::setBlendLevel %d\n", level); unsigned char value = 0xFF;