From 6ac50d55ca665af1e4fae2f39d03cf2e0012e6fc Mon Sep 17 00:00:00 2001 From: striper Date: Thu, 15 Sep 2011 15:33:19 +0000 Subject: [PATCH] - revert Rev. 1689 because this commit probably only hides the real problem git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1690 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/driver/pictureviewer/pictureviewer.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index 36d7bdd8e..29750c6eb 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -570,20 +570,15 @@ fb_pixel_t * CPictureViewer::getIcon (const std::string & name, int *width, int } rgbbuff = (unsigned char *) malloc (x * y * 3); if (rgbbuff == NULL) { - printf ("getIcon: Error: rgbbuff malloc\n"); + printf ("getIcon: Error: malloc\n"); return NULL; } if (fh->get_pic (name.c_str (), &rgbbuff, &x, &y) == FH_ERROR_OK) { 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 *) cs_malloc_uncached(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)); //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++) { int transp = 0;