]>
Commit | Line | Data |
---|---|---|
4ba74276 AM |
1 | From: inkscape upstream |
2 | Fix compilation against libpng-1.5 | |
3 | ||
4 | === modified file 'src/extension/internal/pdfinput/svg-builder.cpp' | |
5 | --- src/extension/internal/pdfinput/svg-builder.cpp 2011-10-27 04:55:51 +0000 | |
6 | +++ src/extension/internal/pdfinput/svg-builder.cpp 2011-10-29 20:34:00 +0000 | |
7 | @@ -1481,7 +1481,7 @@ | |
8 | return NULL; | |
9 | } | |
10 | // Set error handler | |
11 | - if (setjmp(png_ptr->jmpbuf)) { | |
12 | + if (setjmp(png_jmpbuf(png_ptr))) { | |
13 | png_destroy_write_struct(&png_ptr, &info_ptr); | |
14 | return NULL; | |
15 | } | |
16 | ||
17 | === modified file 'src/helper/png-write.cpp' | |
18 | --- src/helper/png-write.cpp 2011-08-07 10:53:12 +0000 | |
19 | +++ src/helper/png-write.cpp 2011-10-29 20:34:00 +0000 | |
20 | @@ -166,8 +166,8 @@ | |
21 | /* Set error handling. REQUIRED if you aren't supplying your own | |
22 | * error hadnling functions in the png_create_write_struct() call. | |
23 | */ | |
24 | - if (setjmp(png_ptr->jmpbuf)) { | |
25 | - /* If we get here, we had a problem reading the file */ | |
26 | + if (setjmp(png_jmpbuf(png_ptr))) { | |
27 | + // If we get here, we had a problem reading the file | |
28 | fclose(fp); | |
29 | png_destroy_write_struct(&png_ptr, &info_ptr); | |
30 | return false; | |
31 |