Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 287339 Details for
Bug 383567
app-office/abiword fails to compile with >=media-libs/libpng-1.5
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
correct patch
abiword-2.8.6-libpng15.patch (text/plain), 3.62 KB, created by
Markos Chandras (RETIRED)
on 2011-09-21 18:13:03 UTC
(
hide
)
Description:
correct patch
Filename:
MIME Type:
Creator:
Markos Chandras (RETIRED)
Created:
2011-09-21 18:13:03 UTC
Size:
3.62 KB
patch
obsolete
>$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ > >Fix build with png-1.5. > >--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2009-06-25 04:02:06.000000000 +0000 >+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp >@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap > > /* Clean Up Memory Used */ > >- FREEP(m_pPNGInfo->palette); >+ png_colorp palette; >+ int num_palette; >+ png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette ); >+ FREEP(palette); > DELETEP(pBB); > png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); > >@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P > * 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); >@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P > UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) > { > /* Reset error handling for libpng */ >- if (setjmp(m_pPNG->jmpbuf)) >+ if (setjmp(png_jmpbuf(m_pPNG))) > { > png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); > return UT_ERROR; >@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P > UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) > { > /* Reset error handling for libpng */ >- if (setjmp(m_pPNG->jmpbuf)) >+ if (setjmp(png_jmpbuf(m_pPNG))) > { > png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); > return UT_ERROR; > >$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ > >Fix build with png-1.5. > >--- plugins/garble/xp/abiword-garble-png.cpp.orig 2009-09-05 15:34:44.000000000 +0000 >+++ plugins/garble/xp/abiword-garble-png.cpp >@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void* > png_set_strip_alpha( png_ptr ); > png_set_interlace_handling( png_ptr ); > png_set_bgr( png_ptr ); >- rowbytes = info_ptr->rowbytes; >+ rowbytes = png_get_rowbytes( png_ptr, info_ptr ); > png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); > } > >$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); >$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $ > >Fix build with png-1.5. > >--- src/af/util/xp/ut_png.cpp.orig 2008-02-24 03:33:07.000000000 +0000 >+++ src/af/util/xp/ut_png.cpp >@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB > * 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(png_ptr->jmpbuf)) >+ if (setjmp(png_jmpbuf(png_ptr))) > { > /* Free all of the memory associated with the png_ptr and info_ptr */ > png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 383567
:
286949
|
286951
|
287245
| 287339