mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 08:21:12 +02:00
remove unneeded libpng version checks
This commit is contained in:
@@ -50,11 +50,7 @@ int int_png_load(const char *name, unsigned char **buffer, int* xp, int* yp, int
|
||||
fclose(fh);
|
||||
return(FH_ERROR_FORMAT);
|
||||
}
|
||||
#if (PNG_LIBPNG_VER < 10500)
|
||||
if (setjmp(png_ptr->jmpbuf))
|
||||
#else
|
||||
if (setjmp(png_jmpbuf(png_ptr)))
|
||||
#endif
|
||||
{
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
||||
fclose(fh);
|
||||
@@ -158,11 +154,7 @@ int fh_png_getsize(const char *name,int *x,int *y, int /*wanted_width*/, int /*w
|
||||
return(FH_ERROR_FORMAT);
|
||||
}
|
||||
|
||||
#if (PNG_LIBPNG_VER < 10500)
|
||||
if (setjmp(png_ptr->jmpbuf))
|
||||
#else
|
||||
if (setjmp(png_jmpbuf(png_ptr)))
|
||||
#endif
|
||||
{
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
||||
fclose(fh);
|
||||
|
@@ -194,11 +194,7 @@ bool CScreenShot::SavePng()
|
||||
|
||||
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, (png_error_ptr)NULL, (png_error_ptr)NULL);
|
||||
info_ptr = png_create_info_struct(png_ptr);
|
||||
#if (PNG_LIBPNG_VER < 10500)
|
||||
if (setjmp(png_ptr->jmpbuf))
|
||||
#else
|
||||
if (setjmp(png_jmpbuf(png_ptr)))
|
||||
#endif
|
||||
{
|
||||
printf("CScreenShot::SavePng: %s save error\n", filename.c_str());
|
||||
png_destroy_write_struct(&png_ptr, &info_ptr);
|
||||
|
@@ -457,11 +457,7 @@ bool CLCDDisplay::load_png(const char * const filename)
|
||||
png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL);
|
||||
else
|
||||
{
|
||||
#if (PNG_LIBPNG_VER < 10500)
|
||||
if (!(setjmp(png_ptr->jmpbuf)))
|
||||
#else
|
||||
if (!setjmp(png_jmpbuf(png_ptr)))
|
||||
#endif
|
||||
{
|
||||
png_init_io(png_ptr,fh);
|
||||
|
||||
|
Reference in New Issue
Block a user