From 7f48710afe4963d02b606a06fca489e8319c8789 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sat, 29 Oct 2011 13:34:00 -0700 Subject: Updating use of libpng jump buffer. Fixes bug #721029. Fixed bugs: - https://launchpad.net/bugs/721029 (bzr r10707) --- src/extension/internal/pdfinput/svg-builder.cpp | 2 +- src/helper/png-write.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp index 64cb0a152..344c3c5d2 100644 --- a/src/extension/internal/pdfinput/svg-builder.cpp +++ b/src/extension/internal/pdfinput/svg-builder.cpp @@ -1481,7 +1481,7 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height return NULL; } // Set error handler - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_write_struct(&png_ptr, &info_ptr); return NULL; } diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 24da697c1..992c7b886 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -166,8 +166,8 @@ sp_png_write_rgba_striped(SPDocument *doc, /* Set error handling. REQUIRED if you aren't supplying your own * error hadnling functions in the png_create_write_struct() call. */ - if (setjmp(png_ptr->jmpbuf)) { - /* If we get here, we had a problem reading the file */ + if (setjmp(png_jmpbuf(png_ptr))) { + // If we get here, we had a problem reading the file fclose(fp); png_destroy_write_struct(&png_ptr, &info_ptr); return false; -- cgit v1.2.3