We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] fixed some of the function pointers

0001-LIBS-SDL_image-fixed-some-png-pointer-casts-that-con.patch (text/plain), 7.02 KB, created by Martin Gerhardy on 2015-07-31 10:37:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Gerhardy

Created: 2015-07-31 10:37:20 UTC

Size: 7.02 KB

patch

obsolete

>From 0e4467741aeaa57b214549dac5610d2ce8a4a6cb Mon Sep 17 00:00:00 2001
>From: Martin Gerhardy <martin.gerhardy@gmail.com>
>Date: Fri, 31 Jul 2015 12:24:11 +0200
>Subject: [PATCH] LIBS: SDL_image fixed some png pointer casts that confused
> msvc
>
>---
> src/libs/SDL2_image/IMG_png.c | 46 +++++++++++++++++++++----------------------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
>diff --git a/src/libs/SDL2_image/IMG_png.c b/src/libs/SDL2_image/IMG_png.c
>index 74a7964..8c9958d 100644
>--- a/src/libs/SDL2_image/IMG_png.c
>+++ b/src/libs/SDL2_image/IMG_png.c
>@@ -88,20 +88,20 @@ static struct {
>     png_uint_32 (*png_get_IHDR) (png_const_structrp png_ptr, png_const_inforp 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_const_structrp png_ptr);
>     png_byte (*png_get_channels) (png_const_structrp png_ptr, png_const_inforp info_ptr);
>-    png_uint_32 (*png_get_PLTE) (png_const_structrp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette);
>-    png_uint_32 (*png_get_tRNS) (png_const_structrp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
>+    png_uint_32 (*png_get_PLTE) (png_const_structrp png_ptr, png_inforp info_ptr, png_colorp *palette, int *num_palette);
>+    png_uint_32 (*png_get_tRNS) (png_const_structrp png_ptr, png_inforp info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values);
>     png_uint_32 (*png_get_valid) (png_const_structrp png_ptr, png_const_inforp info_ptr, png_uint_32 flag);
>-    void (*png_read_image) (png_structp png_ptr, png_bytepp image);
>-    void (*png_read_info) (png_structp png_ptr, png_infop info_ptr);
>-    void (*png_read_update_info) (png_structp png_ptr, png_infop info_ptr);
>-    void (*png_set_expand) (png_structp png_ptr);
>-    void (*png_set_gray_to_rgb) (png_structp png_ptr);
>-    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);
>+    void (*png_read_image) (png_structrp png_ptr, png_bytepp image);
>+    void (*png_read_info) (png_structrp png_ptr, png_infop info_ptr);
>+    void (*png_read_update_info) (png_structrp png_ptr, png_infop info_ptr);
>+    void (*png_set_expand) (png_structrp png_ptr);
>+    void (*png_set_gray_to_rgb) (png_structrp png_ptr);
>+    void (*png_set_packing) (png_structrp png_ptr);
>+    void (*png_set_read_fn) (png_structrp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn);
>+    void (*png_set_strip_16) (png_structrp png_ptr);
>     int (*png_sig_cmp) (png_const_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);
>+    jmp_buf* (*png_set_longjmp_fn) (png_structrp, png_longjmp_ptr, size_t);
> #endif
> } lib;
> 
>@@ -121,7 +121,7 @@ int IMG_InitPNG()
>             return -1;
>         }
>         lib.png_create_read_struct =
>-            (png_structp (*) (png_const_charp, png_voidp, png_error_ptr, png_error_ptr))
>+            (png_structrp (*) (png_const_charp, png_voidp, png_error_ptr, png_error_ptr))
>             SDL_LoadFunction(lib.handle, "png_create_read_struct");
>         if ( lib.png_create_read_struct == NULL ) {
>             SDL_UnloadObject(lib.handle);
>@@ -156,14 +156,14 @@ int IMG_InitPNG()
>             return -1;
>         }
>         lib.png_get_PLTE =
>-            (png_uint_32 (*) (png_const_structrp, png_infop, png_colorp *, int *))
>+            (png_uint_32 (*) (png_const_structrp, png_inforp, 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_const_structrp, png_infop, png_bytep *, int *, png_color_16p *))
>+            (png_uint_32 (*) (png_const_structrp, png_inforp, png_bytep *, int *, png_color_16p *))
>             SDL_LoadFunction(lib.handle, "png_get_tRNS");
>         if ( lib.png_get_tRNS == NULL ) {
>             SDL_UnloadObject(lib.handle);
>@@ -177,56 +177,56 @@ int IMG_InitPNG()
>             return -1;
>         }
>         lib.png_read_image =
>-            (void (*) (png_structp, png_bytepp))
>+            (void (*) (png_structrp, png_bytepp))
>             SDL_LoadFunction(lib.handle, "png_read_image");
>         if ( lib.png_read_image == NULL ) {
>             SDL_UnloadObject(lib.handle);
>             return -1;
>         }
>         lib.png_read_info =
>-            (void (*) (png_structp, png_infop))
>+            (void (*) (png_structrp, png_infop))
>             SDL_LoadFunction(lib.handle, "png_read_info");
>         if ( lib.png_read_info == NULL ) {
>             SDL_UnloadObject(lib.handle);
>             return -1;
>         }
>         lib.png_read_update_info =
>-            (void (*) (png_structp, png_infop))
>+            (void (*) (png_structrp, png_infop))
>             SDL_LoadFunction(lib.handle, "png_read_update_info");
>         if ( lib.png_read_update_info == NULL ) {
>             SDL_UnloadObject(lib.handle);
>             return -1;
>         }
>         lib.png_set_expand =
>-            (void (*) (png_structp))
>+            (void (*) (png_structrp))
>             SDL_LoadFunction(lib.handle, "png_set_expand");
>         if ( lib.png_set_expand == NULL ) {
>             SDL_UnloadObject(lib.handle);
>             return -1;
>         }
>         lib.png_set_gray_to_rgb =
>-            (void (*) (png_structp))
>+            (void (*) (png_structrp))
>             SDL_LoadFunction(lib.handle, "png_set_gray_to_rgb");
>         if ( lib.png_set_gray_to_rgb == NULL ) {
>             SDL_UnloadObject(lib.handle);
>             return -1;
>         }
>         lib.png_set_packing =
>-            (void (*) (png_structp))
>+            (void (*) (png_structrp))
>             SDL_LoadFunction(lib.handle, "png_set_packing");
>         if ( lib.png_set_packing == NULL ) {
>             SDL_UnloadObject(lib.handle);
>             return -1;
>         }
>         lib.png_set_read_fn =
>-            (void (*) (png_structp, png_voidp, png_rw_ptr))
>+            (void (*) (png_structrp, png_voidp, png_rw_ptr))
>             SDL_LoadFunction(lib.handle, "png_set_read_fn");
>         if ( lib.png_set_read_fn == NULL ) {
>             SDL_UnloadObject(lib.handle);
>             return -1;
>         }
>         lib.png_set_strip_16 =
>-            (void (*) (png_structp))
>+            (void (*) (png_structrp))
>             SDL_LoadFunction(lib.handle, "png_set_strip_16");
>         if ( lib.png_set_strip_16 == NULL ) {
>             SDL_UnloadObject(lib.handle);
>@@ -241,7 +241,7 @@ int IMG_InitPNG()
>         }
> #ifndef LIBPNG_VERSION_12
>         lib.png_set_longjmp_fn =
>-            (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t))
>+            (jmp_buf * (*) (png_structrp, png_longjmp_ptr, size_t))
>             SDL_LoadFunction(lib.handle, "png_set_longjmp_fn");
>         if ( lib.png_set_longjmp_fn == NULL ) {
>             SDL_UnloadObject(lib.handle);
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 3082: 2231 | 2232

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.