diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-03-06 09:40:14 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-03-06 09:40:14 (GMT) |
| commit | aeb4a0d7eb99e5461f8f5e09b1af88829c2d12a8 (patch) | |
| tree | 2bfdbf53dcecacb46de3c3c5b6317ab18b74f556 /src/sdl_image-1-png.patch | |
| parent | 3467773675478d8ae8918f99ff32ff3e99d89a8a (diff) | |
| download | mxe-aeb4a0d7eb99e5461f8f5e09b1af88829c2d12a8.zip mxe-aeb4a0d7eb99e5461f8f5e09b1af88829c2d12a8.tar.gz mxe-aeb4a0d7eb99e5461f8f5e09b1af88829c2d12a8.tar.bz2 | |
package sdl_image: simplify patch
Diffstat (limited to 'src/sdl_image-1-png.patch')
| -rw-r--r-- | src/sdl_image-1-png.patch | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/sdl_image-1-png.patch b/src/sdl_image-1-png.patch index 17eb36e..b55d17b 100644 --- a/src/sdl_image-1-png.patch +++ b/src/sdl_image-1-png.patch @@ -2,7 +2,7 @@ This file is part of mingw-cross-env. See doc/index.html for further information. diff --git a/IMG_png.c b/IMG_png.c -index a79fb9c..f85b6c8 100644 +index a79fb9c..67af463 100644 --- a/IMG_png.c +++ b/IMG_png.c @@ -80,8 +80,13 @@ static struct { @@ -73,12 +73,11 @@ index a79fb9c..f85b6c8 100644 if ( surface == NULL ) { error = "Out of memory"; goto done; -@@ -466,6 +491,12 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) +@@ -466,6 +491,11 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) /* Load the palette, if any */ palette = surface->format->palette; +#if (PNG_LIBPNG_VER >= 10500) -+ palette = surface->format->palette; + png_colorp info_palette = 0; + int info_num_palette = 0; + png_get_PLTE(png_ptr, info_ptr, &info_palette, &info_num_palette); @@ -86,7 +85,7 @@ index a79fb9c..f85b6c8 100644 if ( palette ) { if(color_type == PNG_COLOR_TYPE_GRAY) { palette->ncolors = 256; -@@ -474,12 +505,21 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) +@@ -474,12 +504,21 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) palette->colors[i].g = i; palette->colors[i].b = i; } |