This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository scorched3d.
commit 7ffaad43d15803cb380d92fd5d83f2298c0950a0 Author: Markus Koschany <[email protected]> Date: Fri Jul 15 17:33:28 2016 +0200 Drop libpng16.patch --- debian/patches/libpng16.patch | 88 ------------------------------------------- debian/patches/series | 1 - 2 files changed, 89 deletions(-) diff --git a/debian/patches/libpng16.patch b/debian/patches/libpng16.patch deleted file mode 100644 index a103377..0000000 --- a/debian/patches/libpng16.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- scorched3d-43.3.d+dfsg.orig/src/client/client/LoadPNG.cpp -+++ scorched3d-43.3.d+dfsg/src/client/client/LoadPNG.cpp -@@ -28,6 +28,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s - int row, i; - volatile int ckey = -1; - png_color_16 *transv; -+ png_byte channels; - - if ( !src ) { - /* The error message has been set in SDL_RWFromFile */ -@@ -58,7 +59,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s - * 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) ) { -+ if ( setjmp(png_jmpbuf(png_ptr)) ) { - error = "Error reading the PNG file."; - goto done; - } -@@ -122,14 +123,17 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s - - /* Allocate the SDL surface to hold the image */ - Rmask = Gmask = Bmask = Amask = 0 ; -+ -+ channels = png_get_channels(png_ptr, info_ptr); -+ - if ( color_type != PNG_COLOR_TYPE_PALETTE ) { - if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) { - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (channels == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (channels == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -137,7 +141,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*channels, Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -178,6 +182,9 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s - /* Load the palette, if any */ - palette = surface->format->palette; - if ( palette ) { -+ int num_palette; -+ png_colorp png_palette; -+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); - if(color_type == PNG_COLOR_TYPE_GRAY) { - palette->ncolors = 256; - for(i = 0; i < 256; i++) { -@@ -185,12 +192,12 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s - 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; i<info_ptr->num_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 (num_palette > 0 ) { -+ palette->ncolors = num_palette; -+ for( i=0; i<num_palette; ++i ) { -+ palette->colors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; - } - } - } ---- scorched3d-43.3.d+dfsg.orig/src/common/image/ImagePngFactory.cpp -+++ scorched3d-43.3.d+dfsg/src/common/image/ImagePngFactory.cpp -@@ -62,7 +62,7 @@ struct user_read_struct - - static void user_png_error(png_structp png_ptr, png_const_charp msg) - { -- longjmp(png_ptr->jmpbuf,1); -+ longjmp(png_jmpbuf(png_ptr),1); - } - - static void user_png_warning(png_structp png_ptr, png_const_charp msg) diff --git a/debian/patches/series b/debian/patches/series index 1f0e661..db30f2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,3 @@ 0006-fix-freetype-includes.patch 0007-spelling.patch 0008-wx3.0-compat.patch -libpng16.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scorched3d.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
