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

framebuffer: add missing slashs to iconBasePath

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c3d873fba
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-07 (Thu, 07 May 2015)

Origin message was:
------------------
- framebuffer: add missing slashs to iconBasePath

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-05-07 12:10:13 +02:00
parent 9fb7e6d44f
commit 5f6b83e8bf
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/driver/framebuffer.cpp
View File

@@ -1009,10 +1009,10 @@ bool CFrameBuffer::paintIcon8(const std::string & filename, const int x, const i
uint16_t width, height; uint16_t width, height;
int lfd; int lfd;
lfd = open((iconBasePath + filename).c_str(), O_RDONLY); lfd = open((iconBasePath + "/" + filename).c_str(), O_RDONLY);
if (lfd == -1) { if (lfd == -1) {
printf("paintIcon8: error while loading icon: %s%s\n", iconBasePath.c_str(), filename.c_str()); printf("paintIcon8: error while loading icon: %s/%s\n", iconBasePath.c_str(), filename.c_str());
return false; return false;
} }
@@ -1182,10 +1182,10 @@ void CFrameBuffer::loadPal(const std::string & filename, const unsigned char off
struct rgbData rgbdata; struct rgbData rgbdata;
int lfd; int lfd;
lfd = open((iconBasePath + filename).c_str(), O_RDONLY); lfd = open((iconBasePath + "/" + filename).c_str(), O_RDONLY);
if (lfd == -1) { if (lfd == -1) {
printf("error while loading palette: %s%s\n", iconBasePath.c_str(), filename.c_str()); printf("error while loading palette: %s/%s\n", iconBasePath.c_str(), filename.c_str());
return; return;
} }
@@ -1488,11 +1488,11 @@ bool CFrameBuffer::loadPictureToMem(const std::string & filename, const uint16_t
//printf("%s(%d, %d, memp)\n", __FUNCTION__, width, height); //printf("%s(%d, %d, memp)\n", __FUNCTION__, width, height);
lfd = open((iconBasePath + filename).c_str(), O_RDONLY ); lfd = open((iconBasePath + "/" + filename).c_str(), O_RDONLY );
if (lfd == -1) if (lfd == -1)
{ {
printf("error while loading icon: %s%s\n", iconBasePath.c_str(), filename.c_str()); printf("error while loading icon: %s/%s\n", iconBasePath.c_str(), filename.c_str());
return false; return false;
} }
@@ -1544,11 +1544,11 @@ bool CFrameBuffer::savePictureFromMem(const std::string & filename, const fb_pix
header.height_hi = height >> 8; header.height_hi = height >> 8;
header.transp = 0; header.transp = 0;
lfd = open((iconBasePath + filename).c_str(), O_WRONLY | O_CREAT, 0644); lfd = open((iconBasePath + "/" + filename).c_str(), O_WRONLY | O_CREAT, 0644);
if (lfd==-1) if (lfd==-1)
{ {
printf("error while saving icon: %s%s", iconBasePath.c_str(), filename.c_str() ); printf("error while saving icon: %s/%s", iconBasePath.c_str(), filename.c_str() );
return false; return false;
} }
@@ -1613,7 +1613,7 @@ bool CFrameBuffer::loadBackgroundPic(const std::string & filename, bool show)
delete[] background; delete[] background;
background = NULL; background = NULL;
} }
background = g_PicViewer->getImage(iconBasePath + filename, BACKGROUNDIMAGEWIDTH, 576); background = g_PicViewer->getImage(iconBasePath + "/" + filename, BACKGROUNDIMAGEWIDTH, 576);
if (background == NULL) { if (background == NULL) {
background=0; background=0;