mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fb_ng: silence some compiler warnings

Browse Source 
Origin commit data
------------------
Commit: 9543dfff64
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
This commit is contained in:
Stefan Seyfried
2013-03-24 19:22:49 +01:00
parent 27b425d35c
commit 63a9a75a8f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/fbaccel.cpp
View File

@@ -538,12 +538,13 @@ void CFbAccel::paintLine(int xa, int ya, int xb, int yb, const fb_pixel_t col)
#if !HAVE_TRIPLEDRAGON #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) 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; int xc, yc;
xc = (width > fb->xRes) ? fb->xRes : width; xc = (width > fb->xRes) ? fb->xRes : width;
yc = (height > fb->yRes) ? fb->yRes : height; yc = (height > fb->yRes) ? fb->yRes : height;
#endif
#ifdef USE_NEVIS_GXA #ifdef USE_NEVIS_GXA
(void)transp;
u32 cmd; u32 cmd;
void *uKva; void *uKva;
@@ -611,7 +612,7 @@ void CFbAccel::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32_t x
#else #else
fb_pixel_t *data = (fb_pixel_t *) fbbuff; 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; fb_pixel_t * d2;
for (int count = 0; count < yc; count++ ) { for (int count = 0; count < yc; count++ ) {

5
src/driver/framebuffer_ng.cpp
View File

@@ -146,6 +146,7 @@ void CFrameBuffer::init(const char * const fbDevice)
int tr = 0xFF; int tr = 0xFF;
#ifdef USE_OPENGL #ifdef USE_OPENGL
(void)fbDevice;
fd = -1; fd = -1;
if(!mpGLThreadObj) if(!mpGLThreadObj)
{ {
@@ -171,6 +172,8 @@ void CFrameBuffer::init(const char * const fbDevice)
mpGLThreadObj->Start(); mpGLThreadObj->Start();
mpGLThreadObj->waitInit(); mpGLThreadObj->waitInit();
} }
else
goto nolfb;
} }
lfb = reinterpret_cast<fb_pixel_t*>(mpGLThreadObj->getOSDBuffer()); lfb = reinterpret_cast<fb_pixel_t*>(mpGLThreadObj->getOSDBuffer());
memset(lfb, 0x7f, screeninfo.xres * screeninfo.yres * 4); memset(lfb, 0x7f, screeninfo.xres * screeninfo.yres * 4);
@@ -445,6 +448,7 @@ void CFrameBuffer::setTransparency( int /*tr*/ )
#if !HAVE_TRIPLEDRAGON #if !HAVE_TRIPLEDRAGON
void CFrameBuffer::setBlendMode(uint8_t mode) void CFrameBuffer::setBlendMode(uint8_t mode)
{ {
(void)mode;
#ifdef HAVE_COOL_HARDWARE #ifdef HAVE_COOL_HARDWARE
if (ioctl(fd, FBIO_SETBLENDMODE, mode)) if (ioctl(fd, FBIO_SETBLENDMODE, mode))
printf("FBIO_SETBLENDMODE failed.\n"); printf("FBIO_SETBLENDMODE failed.\n");
@@ -453,6 +457,7 @@ void CFrameBuffer::setBlendMode(uint8_t mode)
void CFrameBuffer::setBlendLevel(int level) void CFrameBuffer::setBlendLevel(int level)
{ {
(void)level;
#ifdef HAVE_COOL_HARDWARE #ifdef HAVE_COOL_HARDWARE
//printf("CFrameBuffer::setBlendLevel %d\n", level); //printf("CFrameBuffer::setBlendLevel %d\n", level);
unsigned char value = 0xFF; unsigned char value = 0xFF;