mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-01 18:01:13 +02:00
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
#ifdef FBV_SUPPORT_GIF
|
||||
#include "pictureviewer.h"
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
@@ -5,7 +5,7 @@
|
||||
#include "pv_config.h"
|
||||
#include "driver/framebuffer.h"
|
||||
|
||||
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
@@ -587,7 +587,7 @@ fb_pixel_t * CPictureViewer::int_getImage(const std::string & name, int *width,
|
||||
if (buffer == NULL)
|
||||
{
|
||||
printf("%s: Error: malloc\n", mode_str.c_str());
|
||||
return false;
|
||||
return 0;
|
||||
}
|
||||
#ifdef FBV_SUPPORT_PNG
|
||||
if ((name.find(".png") == (name.length() - 4)) && (fh_png_id(name.c_str())))
|
||||
|
@@ -34,6 +34,7 @@
|
||||
|
||||
#include <sys/timeb.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
SHTDCNT::SHTDCNT()
|
||||
|
Reference in New Issue
Block a user