24 lines
941 B
Text
24 lines
941 B
Text
$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
|
|
|
|
Fix build with png-1.5.
|
|
|
|
--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2009-07-01 04:02:04.000000000 +0000
|
|
+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
|
|
@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
|
|
/** needed for the stejmp context */
|
|
UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
|
|
{
|
|
- if (setjmp(m_pPNG->jmpbuf))
|
|
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
|
{
|
|
DELETEP(m_pPngBB);
|
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|
|
@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
|
|
* the normal method of doing things with libpng). REQUIRED unless you
|
|
* set up your own error handlers in the png_create_read_struct() earlier.
|
|
*/
|
|
- if (setjmp(m_pPNG->jmpbuf))
|
|
+ if (setjmp(png_jmpbuf(m_pPNG)))
|
|
{
|
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
|
png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
|