Extract from libpng/CHANGES: Make the 'png_jmpbuf' macro expand to a call that records the correct longjmp function as well as returning a pointer to the setjmp jmp_buf buffer, and marked direct access to jmpbuf 'deprecated'. (John Bowler) So the PNGImageDecoder should use png_jmpbuf(m_png) instead of m_png->jmpbuf if libpng >= 1.4 is used.
Created attachment 59237 [details] proposed patch
Comment on attachment 59237 [details] proposed patch Looks good to me.
Comment on attachment 59237 [details] proposed patch Rejecting patch 59237 from commit-queue. Failed to run "[u'/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Xan Lopez', u'--force']" exit_code: 1 Parsed 2 diffs from patch file(s). patching file WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebCore/platform/image-decoders/png/PNGImageDecoder.cpp Hunk #3 FAILED at 131. Hunk #4 FAILED at 219. Hunk #5 succeeded at 303 (offset 14 lines). 2 out of 5 hunks FAILED -- saving rejects to file WebCore/platform/image-decoders/png/PNGImageDecoder.cpp.rej patch unexpectedly ends in middle of line Full output: http://webkit-commit-queue.appspot.com/results/3339000
Manually landed a rebased patch as http://trac.webkit.org/changeset/62114 Sorry for the noise Eric
Question: would the following work for you? #ifndef png_jmpbuf #define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) #endif