diff options
Diffstat (limited to 'cad/leocad/files/patch-im_png.cpp')
-rw-r--r-- | cad/leocad/files/patch-im_png.cpp | 47 |
1 files changed, 46 insertions, 1 deletions
diff --git a/cad/leocad/files/patch-im_png.cpp b/cad/leocad/files/patch-im_png.cpp index 127f267823d1..39415c645ea7 100644 --- a/cad/leocad/files/patch-im_png.cpp +++ b/cad/leocad/files/patch-im_png.cpp @@ -1,5 +1,5 @@ --- common/im_png.cpp.orig 2000-09-16 19:18:01.000000000 +0200 -+++ common/im_png.cpp 2010-03-29 20:47:19.000000000 +0200 ++++ common/im_png.cpp 2012-04-27 08:02:21.000000000 +0200 @@ -34,7 +34,7 @@ return NULL; @@ -9,3 +9,48 @@ { fclose(f); return NULL; // bad signature +@@ -55,7 +55,7 @@ + return NULL; // out of memory + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -69,7 +69,7 @@ + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + NULL, NULL, NULL); + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -80,7 +80,7 @@ + { + png_get_bKGD(png_ptr, info_ptr, &pBackground); + +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -113,7 +113,7 @@ + } + else + { +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + fclose(f); +@@ -283,7 +283,7 @@ + return false; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + fclose(fp); |