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

fb_generic: fix compil warning

Browse Source
This commit is contained in:
Jacek Jendrzej
2020-01-29 22:50:46 +01:00
parent 55ed87727b
commit 098438a5ff
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/driver/fb_generic.cpp
View File

@@ -778,7 +778,12 @@ bool CFrameBuffer::paintIcon8(const std::string & filename, const int x, const i
return false; return false;
} }
read(lfd, &header, sizeof(struct rawHeader)); ssize_t r = read(lfd, &header, sizeof(struct rawHeader));
if(r <= 0)
{
close(fd);
return false;
}
width = (header.width_hi << 8) | header.width_lo; width = (header.width_hi << 8) | header.width_lo;
height = (header.height_hi << 8) | header.height_lo; height = (header.height_hi << 8) | header.height_lo;
@@ -794,7 +799,11 @@ bool CFrameBuffer::paintIcon8(const std::string & filename, const int x, const i
fb_pixel_t *d = getFrameBufferPointer() + x + swidth * y; fb_pixel_t *d = getFrameBufferPointer() + x + swidth * y;
fb_pixel_t * d2; fb_pixel_t * d2;
for (int count=0; count<height; count ++ ) { for (int count=0; count<height; count ++ ) {
read(lfd, &pixbuf[0], width ); r = read(lfd, &pixbuf[0], width );
if(r <= 0){
close(fd);
return false;
}
unsigned char *pixpos = &pixbuf[0]; unsigned char *pixpos = &pixbuf[0];
d2 = d; d2 = d;
for (int count2=0; count2<width; count2 ++ ) { for (int count2=0; count2<width; count2 ++ ) {
@@ -892,7 +901,11 @@ bool CFrameBuffer::paintIcon(const std::string & filename, const int x, const in
unsigned char pixbuf[768]; unsigned char pixbuf[768];
for (int count = 0; count < height; count ++ ) { for (int count = 0; count < height; count ++ ) {
read(lfd, &pixbuf[0], width >> 1 ); s = read(lfd, &pixbuf[0], width >> 1 );
if(s <= 0)
{
break;
}
unsigned char *pixpos = &pixbuf[0]; unsigned char *pixpos = &pixbuf[0];
for (int count2 = 0; count2 < width >> 1; count2 ++ ) { for (int count2 = 0; count2 < width >> 1; count2 ++ ) {
unsigned char compressed = *pixpos; unsigned char compressed = *pixpos;