From b9944a9d2b59df7ab7c3a0ee2409e8448992201e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Dec 26 2015 14:19:35 +0000 Subject: Fix runtime warnings when loading interlaced pngs (rhbz#829419) --- diff --git a/SDL_image-1.2.10-libpng15.patch b/SDL_image-1.2.10-libpng15.patch deleted file mode 100644 index d153e15..0000000 --- a/SDL_image-1.2.10-libpng15.patch +++ /dev/null @@ -1,160 +0,0 @@ ---- sdl-image1.2-1.2.10.orig/IMG_png.c -+++ sdl-image1.2-1.2.10/IMG_png.c -@@ -71,6 +71,10 @@ - #endif - #include - -+/* Check for the older version of libpng */ -+#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) -+#define LIBPNG_VERSION_12 -+#endif - - static struct { - int loaded; -@@ -80,6 +84,8 @@ - void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); - png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); - png_voidp (*png_get_io_ptr) (png_structp png_ptr); -+ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); -+ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); - png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); - png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); - void (*png_read_image) (png_structp png_ptr, png_bytepp image); -@@ -91,6 +97,9 @@ - void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); - void (*png_set_strip_16) (png_structp png_ptr); - int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); -+#ifndef LIBPNG_VERSION_12 -+ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); -+#endif - } lib; - - #ifdef LOAD_PNG_DYNAMIC -@@ -129,6 +138,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_channels = -+ (png_byte (*) (png_structp, png_infop)) -+ SDL_LoadFunction(lib.handle, "png_get_channels"); -+ if ( lib.png_get_channels == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_io_ptr = - (png_voidp (*) (png_structp)) - SDL_LoadFunction(lib.handle, "png_get_io_ptr"); -@@ -136,6 +152,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_PLTE = -+ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) -+ SDL_LoadFunction(lib.handle, "png_get_PLTE"); -+ if ( lib.png_get_PLTE == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_tRNS = - (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) - SDL_LoadFunction(lib.handle, "png_get_tRNS"); -@@ -213,6 +236,15 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = -+ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) -+ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); -+ if ( lib.png_set_longjmp_fn == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -+#endif - } - ++lib.loaded; - -@@ -236,7 +268,9 @@ - lib.png_create_read_struct = png_create_read_struct; - lib.png_destroy_read_struct = png_destroy_read_struct; - lib.png_get_IHDR = png_get_IHDR; -+ lib.png_get_channels = png_get_channels; - lib.png_get_io_ptr = png_get_io_ptr; -+ lib.png_get_PLTE = png_get_PLTE; - lib.png_get_tRNS = png_get_tRNS; - lib.png_get_valid = png_get_valid; - lib.png_read_image = png_read_image; -@@ -248,6 +282,9 @@ - lib.png_set_read_fn = png_set_read_fn; - lib.png_set_strip_16 = png_set_strip_16; - lib.png_sig_cmp = png_sig_cmp; -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = png_set_longjmp_fn; -+#endif - } - ++lib.loaded; - -@@ -347,7 +384,12 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if ( setjmp(png_ptr->jmpbuf) ) { -+#ifndef LIBPNG_VERSION_12 -+ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) -+#else -+ if ( setjmp(png_ptr->jmpbuf) ) -+#endif -+ { - error = "Error reading the PNG file."; - goto done; - } -@@ -416,9 +458,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -426,7 +468,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -467,6 +509,9 @@ - /* Load the palette, if any */ - palette = surface->format->palette; - if ( palette ) { -+ int png_num_palette; -+ png_colorp png_palette; -+ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); - if(color_type == PNG_COLOR_TYPE_GRAY) { - palette->ncolors = 256; - for(i = 0; i < 256; i++) { -@@ -474,12 +519,12 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0 ) { -- palette->ncolors = info_ptr->num_palette; -- for( i=0; inum_palette; ++i ) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else if (png_num_palette > 0 ) { -+ palette->ncolors = png_num_palette; -+ for( i=0; icolors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; - } - } - } diff --git a/SDL_image-1.2.12-interlaced-png-warning-fix.patch b/SDL_image-1.2.12-interlaced-png-warning-fix.patch new file mode 100644 index 0000000..74dc43c --- /dev/null +++ b/SDL_image-1.2.12-interlaced-png-warning-fix.patch @@ -0,0 +1,43 @@ +diff -up SDL_image-1.2.12/IMG_png.c~ SDL_image-1.2.12/IMG_png.c +--- SDL_image-1.2.12/IMG_png.c~ 2012-01-21 02:51:33.000000000 +0100 ++++ SDL_image-1.2.12/IMG_png.c 2015-12-26 12:39:21.150828413 +0100 +@@ -95,6 +95,7 @@ static struct { + void (*png_set_packing) (png_structp png_ptr); + void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); + void (*png_set_strip_16) (png_structp png_ptr); ++ int (*png_set_interlace_handling) (png_structp png_ptr); + int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); + #ifndef LIBPNG_VERSION_12 + jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); +@@ -228,6 +229,13 @@ int IMG_InitPNG() + SDL_UnloadObject(lib.handle); + return -1; + } ++ lib.png_set_interlace_handling = ++ (void (*) (png_structp)) ++ SDL_LoadFunction(lib.handle, "png_set_interlace_handling"); ++ if ( lib.png_set_interlace_handling == NULL ) { ++ SDL_UnloadObject(lib.handle); ++ return -1; ++ } + lib.png_sig_cmp = + (int (*) (png_bytep, png_size_t, png_size_t)) + SDL_LoadFunction(lib.handle, "png_sig_cmp"); +@@ -280,6 +288,7 @@ int IMG_InitPNG() + lib.png_set_packing = png_set_packing; + lib.png_set_read_fn = png_set_read_fn; + lib.png_set_strip_16 = png_set_strip_16; ++ lib.png_set_interlace_handling = png_set_interlace_handling; + lib.png_sig_cmp = png_sig_cmp; + #ifndef LIBPNG_VERSION_12 + lib.png_set_longjmp_fn = png_set_longjmp_fn; +@@ -404,6 +413,9 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *s + /* tell libpng to strip 16 bit/color files down to 8 bits/color */ + lib.png_set_strip_16(png_ptr) ; + ++ /* tell libpng to de-interlace (if the image is interlaced) */ ++ lib.png_set_interlace_handling(png_ptr) ; ++ + /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single + * byte into separate bytes (useful for paletted and grayscale images). + */ diff --git a/SDL_image.spec b/SDL_image.spec index 83fb3ff..bdb0eca 100644 --- a/SDL_image.spec +++ b/SDL_image.spec @@ -3,22 +3,20 @@ Name: SDL_image Version: 1.2.12 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Image loading library for SDL Group: System Environment/Libraries License: LGPLv2+ URL: http://www.libsdl.org/projects/SDL_image/ Source0: http://www.libsdl.org/projects/%{name}/release/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: SDL_image-1.2.12-interlaced-png-warning-fix.patch BuildRequires: SDL-devel >= 1.2.10 BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -#Patch0: SDL_image-1.2.10-libpng15.patch - %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library designed to provide fast access to the graphics frame buffer and audio @@ -41,8 +39,8 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -#%patch0 -p1 %build # XCF support is crashy in 1.2.4 @@ -56,7 +54,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT %makeinstall mkdir -p $RPM_BUILD_ROOT%{_bindir} ./libtool --mode=install /usr/bin/install showimage $RPM_BUILD_ROOT%{_bindir} @@ -64,10 +61,6 @@ mkdir -p $RPM_BUILD_ROOT%{_bindir} find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig @@ -75,20 +68,21 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) %doc README CHANGES COPYING %{_bindir}/showimage %{_libdir}/lib*.so.* %files devel -%defattr(-,root,root) %{_libdir}/lib*.so %{_includedir}/SDL/ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Dec 26 2015 Hans de Goede - 1.2.12-13 +- Fix runtime warnings when loading interlaced pngs (rhbz#829419) + * Tue Jun 16 2015 Fedora Release Engineering - 1.2.12-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild