diff options
Diffstat (limited to 'graphics/glpng/files/patch-glpng.c')
| -rw-r--r-- | graphics/glpng/files/patch-glpng.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/graphics/glpng/files/patch-glpng.c b/graphics/glpng/files/patch-glpng.c index 5a74cc264149..643e476a0e23 100644 --- a/graphics/glpng/files/patch-glpng.c +++ b/graphics/glpng/files/patch-glpng.c @@ -6,13 +6,13 @@ +#include "png.h" #include <GL/glpng.h> - #include <GL/gl.h>
+ #include <GL/gl.h> #include <stdlib.h> #include <math.h> -#include "png/png.h" -
- /* Used to decide if GL/gl.h supports the paletted extension */
- #ifdef GL_COLOR_INDEX1_EXT
+ + /* Used to decide if GL/gl.h supports the paletted extension */ + #ifdef GL_COLOR_INDEX1_EXT @@ -269,14 +269,14 @@ if (pinfo == NULL) return 0; @@ -24,12 +24,12 @@ info = png_create_info_struct(png); endinfo = png_create_info_struct(png); - // DH: added following lines
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- {
- png_destroy_read_struct(&png, &info, &endinfo);
- return 0;
+ // DH: added following lines +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct(&png, &info, &endinfo); + return 0; @@ -373,14 +373,14 @@ png_uint_32 i; @@ -41,9 +41,9 @@ info = png_create_info_struct(png); endinfo = png_create_info_struct(png); - // DH: added following lines
-- if (setjmp(png->jmpbuf))
-+ if (setjmp(png_jmpbuf(png)))
- {
- png_destroy_read_struct(&png, &info, &endinfo);
- return 0;
+ // DH: added following lines +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct(&png, &info, &endinfo); + return 0; |