mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- revert Rev. 1689 because this commit probably only hides the real problem

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1690 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
striper
2011-09-15 15:33:19 +00:00
parent 7658db6423
commit 6ac50d55ca
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver/pictureviewer/pictureviewer.cpp
View File

@@ -570,20 +570,15 @@ fb_pixel_t * CPictureViewer::getIcon (const std::string & name, int *width, int
} }
rgbbuff = (unsigned char *) malloc (x * y * 3); rgbbuff = (unsigned char *) malloc (x * y * 3);
if (rgbbuff == NULL) { if (rgbbuff == NULL) {
printf ("getIcon: Error: rgbbuff malloc\n"); printf ("getIcon: Error: malloc\n");
return NULL; return NULL;
} }
if (fh->get_pic (name.c_str (), &rgbbuff, &x, &y) == FH_ERROR_OK) { if (fh->get_pic (name.c_str (), &rgbbuff, &x, &y) == FH_ERROR_OK) {
int count = x*y; int count = x*y;
//cs_malloc_uncached infrequently generates neutrino segfaults, so let's use malloc (striper) //fbbuff = (fb_pixel_t *) malloc(count * sizeof(fb_pixel_t));
fbbuff = (fb_pixel_t *) malloc(count * sizeof(fb_pixel_t)); fbbuff = (fb_pixel_t *) cs_malloc_uncached(count * sizeof(fb_pixel_t));
//fbbuff = (fb_pixel_t *) cs_malloc_uncached(count * sizeof(fb_pixel_t));
//printf("getIcon: decoded %s, %d x %d buf %x\n", name.c_str (), x, y, fbbuff); //printf("getIcon: decoded %s, %d x %d buf %x\n", name.c_str (), x, y, fbbuff);
if (fbbuff == NULL) {
printf ("getIcon: Error: fbbuff malloc\n");
return NULL;
}
for(int i = 0; i < count ; i++) { for(int i = 0; i < count ; i++) {
int transp = 0; int transp = 0;