Merge pull request #1 from NoNick/master

libpng compilation fix
ugo-nama-kun · Feb 8, 2017 · a5da556 · a5da556
2 parents c71e0f9 + 9165b71
commit a5da556
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/vtorcs-RL-color/src/libs/tgfclient/img.cpp b/vtorcs-RL-color/src/libs/tgfclient/img.cpp
@@ -98,7 +98,7 @@ GfImgReadPng(const char *filename, int *widthp, int *heightp, float screen_gamma
 		return (unsigned char *)NULL;
 	}
 
-	if (setjmp(png_ptr->jmpbuf))
+	if (setjmp(png_jmpbuf(png_ptr)))
 	{
 		/* Free all of the memory associated with the png_ptr and info_ptr */
 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
@@ -229,7 +229,7 @@ GfImgWritePng(unsigned char *img, const char *filename, int width, int height)
 		return -1;
 	}
 
-	if (setjmp(png_ptr->jmpbuf)) {    
+	if (setjmp(png_jmpbuf(png_ptr))) {    
 		png_destroy_write_struct(&png_ptr, &info_ptr);
 		fclose(fp);
 		return -1;

diff --git a/vtorcs-RL-color/src/misc/png2jpg/png2jpg.c b/vtorcs-RL-color/src/misc/png2jpg/png2jpg.c
@@ -90,7 +90,7 @@ ImgReadPng(FILE *fp, int *widthp, int *heightp, float screen_gamma)
 	    return (unsigned char *)NULL;
 	}
 
-    if (setjmp(png_ptr->jmpbuf))
+    if (setjmp(png_jmpbuf(png_ptr)))
 	{
 	    /* Free all of the memory associated with the png_ptr and info_ptr */
 	    png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);