1 --- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
2 +++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
3 @@ -1443,7 +1443,7 @@
4 return NULL;
5 }
6 // Set error handler
7 - if (setjmp(png_ptr->jmpbuf)) {
8 + if (setjmp(png_jmpbuf(png_ptr))) {
9 png_destroy_write_struct(&png_ptr, &info_ptr);
10 return NULL;
11 }
12 --- inkscape-0.48.1/src/helper/png-write.cpp
13 +++ inkscape-0.48.1-mod//src/helper/png-write.cpp
14 @@ -165,7 +165,7 @@
15 /* Set error handling. REQUIRED if you aren't supplying your own
16 * error hadnling functions in the png_create_write_struct() call.
17 */
18 - if (setjmp(png_ptr->jmpbuf)) {
19 + if (setjmp(png_jmpbuf(png_ptr))) {
20 /* If we get here, we had a problem reading the file */
21 fclose(fp);
22 png_destroy_write_struct(&png_ptr, &info_ptr);
23 --- inkscape-0.48.1/src/sp-image.cpp
24 +++ inkscape-0.48.1-mod//src/sp-image.cpp
25 @@ -386,9 +386,13 @@
26
27 #if defined(PNG_iCCP_SUPPORTED)
28 {
29 - char* name = 0;
30 + png_charp name = 0;
31 int compression_type = 0;
32 - char* profile = 0;
33 +#if (PNG_LIBPNG_VER < 10500)
34 + png_charp profile = 0;
35 +#else
36 + png_bytep profile = 0;
37 +#endif
38 png_uint_32 proflen = 0;
39 if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
40 // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
|
