1 --- abiword-2.8.6/src/af/util/xp/ut_png.cpp~ 2008-02-24 04:33:07.000000000 +0100
2 +++ abiword-2.8.6/src/af/util/xp/ut_png.cpp 2012-02-09 01:24:18.808386895 +0100
4 * the normal method of doing things with libpng). REQUIRED unless you
5 * set up your own error handlers in the png_create_read_struct() earlier.
7 - if (setjmp(png_ptr->jmpbuf))
8 + if (setjmp(png_jmpbuf(png_ptr)))
10 /* Free all of the memory associated with the png_ptr and info_ptr */
11 png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
12 --- abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp~ 2009-07-01 06:02:04.000000000 +0200
13 +++ abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp 2012-02-09 01:30:28.706559268 +0100
15 /** needed for the stejmp context */
16 UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
18 - if (setjmp(m_pPNG->jmpbuf))
19 + if (setjmp(png_jmpbuf(m_pPNG)))
22 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
24 * the normal method of doing things with libpng). REQUIRED unless you
25 * set up your own error handlers in the png_create_read_struct() earlier.
27 - if (setjmp(m_pPNG->jmpbuf))
28 + if (setjmp(png_jmpbuf(m_pPNG)))
30 /* Free all of the memory associated with the png_ptr and info_ptr */
31 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
32 --- abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp~ 2009-09-05 17:34:44.000000000 +0200
33 +++ abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp 2012-02-09 01:33:01.223765531 +0100
35 png_set_strip_alpha( png_ptr );
36 png_set_interlace_handling( png_ptr );
37 png_set_bgr( png_ptr );
38 - rowbytes = info_ptr->rowbytes;
39 + rowbytes = png_get_rowbytes(png_ptr, info_ptr);
40 png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
43 --- abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2012-02-09 01:34:30.630725875 +0100
44 +++ abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp 2012-02-09 01:35:26.257576459 +0100
47 /* Clean Up Memory Used */
49 - FREEP(m_pPNGInfo->palette);
52 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
55 * the normal method of doing things with libpng). REQUIRED unless you
56 * set up your own error handlers in the png_create_read_struct() earlier.
58 - if (setjmp(m_pPNG->jmpbuf))
59 + if (setjmp(png_jmpbuf(m_pPNG)))
61 /* Free all of the memory associated with the png_ptr and info_ptr */
62 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
64 UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
66 /* Reset error handling for libpng */
67 - if (setjmp(m_pPNG->jmpbuf))
68 + if (setjmp(png_jmpbuf(m_pPNG)))
70 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
73 UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
75 /* Reset error handling for libpng */
76 - if (setjmp(m_pPNG->jmpbuf))
77 + if (setjmp(png_jmpbuf(m_pPNG)))
79 png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);