Attachment #287339 for bug #383567

Lines 191-197 UT_Error IE_ImpGraphic_BMP::_convertGrap Link Here

(-)plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig (-4 / +7 lines)
191		191
192	/* Clean Up Memory Used */	192	/* Clean Up Memory Used */
193		193
194	FREEP(m_pPNGInfo->palette);	194	png_colorp palette;
		195	int num_palette;
		196	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
		197	FREEP(palette);
195	DELETEP(pBB);	198	DELETEP(pBB);
196	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	199	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
197		200
Lines 313-319 UT_Error IE_ImpGraphic_BMP::Initialize_P Link Here
313	* the normal method of doing things with libpng). REQUIRED unless you	316	* the normal method of doing things with libpng). REQUIRED unless you
314	* set up your own error handlers in the png_create_read_struct() earlier.	317	* set up your own error handlers in the png_create_read_struct() earlier.
315	*/	318	*/
316	if (setjmp(m_pPNG->jmpbuf))	319	if (setjmp(png_jmpbuf(m_pPNG)))
317	{	320	{
318	/* Free all of the memory associated with the png_ptr and info_ptr */	321	/* Free all of the memory associated with the png_ptr and info_ptr */
319	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	322	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
Lines 332-338 UT_Error IE_ImpGraphic_BMP::Initialize_P Link Here
332	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)	335	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
333	{	336	{
334	/* Reset error handling for libpng */	337	/* Reset error handling for libpng */
335	if (setjmp(m_pPNG->jmpbuf))	338	if (setjmp(png_jmpbuf(m_pPNG)))
336	{	339	{
337	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	340	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
338	return UT_ERROR;	341	return UT_ERROR;
Lines 372-378 UT_Error IE_ImpGraphic_BMP::Initialize_P Link Here
372	UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)	375	UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
373	{	376	{
374	/* Reset error handling for libpng */	377	/* Reset error handling for libpng */
375	if (setjmp(m_pPNG->jmpbuf))	378	if (setjmp(png_jmpbuf(m_pPNG)))
376	{	379	{
377	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	380	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
378	return UT_ERROR;	381	return UT_ERROR;

Lines 79-85 bool abiword_document::garble_png( void* Link Here

(-)plugins/garble/xp/abiword-garble-png.cpp.orig (-1 / +1 lines)
79	png_set_strip_alpha( png_ptr );	79	png_set_strip_alpha( png_ptr );
80	png_set_interlace_handling( png_ptr );	80	png_set_interlace_handling( png_ptr );
81	png_set_bgr( png_ptr );	81	png_set_bgr( png_ptr );
82	rowbytes = info_ptr->rowbytes;	82	rowbytes = png_get_rowbytes( png_ptr, info_ptr );
83	png_destroy_read_struct( &png_ptr, &info_ptr, NULL );	83	png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
84	}	84	}
85		85

Lines 185-191 UT_Error IE_ImpGraphic_GdkPixbuf::import Link Here

(-)src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig (-2 / +2 lines)
185	/** needed for the stejmp context */	185	/** needed for the stejmp context */
186	UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)	186	UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
187	{	187	{
188	if (setjmp(m_pPNG->jmpbuf))	188	if (setjmp(png_jmpbuf(m_pPNG)))
189	{	189	{
190	DELETEP(m_pPngBB);	190	DELETEP(m_pPngBB);
191	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	191	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
Lines 446-452 UT_Error IE_ImpGraphic_GdkPixbuf::Initia Link Here
446	* the normal method of doing things with libpng). REQUIRED unless you	446	* the normal method of doing things with libpng). REQUIRED unless you
447	* set up your own error handlers in the png_create_read_struct() earlier.	447	* set up your own error handlers in the png_create_read_struct() earlier.
448	*/	448	*/
449	if (setjmp(m_pPNG->jmpbuf))	449	if (setjmp(png_jmpbuf(m_pPNG)))
450	{	450	{
451	/* Free all of the memory associated with the png_ptr and info_ptr */	451	/* Free all of the memory associated with the png_ptr and info_ptr */
452	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);	452	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);

Lines 71-77 bool UT_PNG_getDimensions(const UT_ByteB Link Here

(-)src/af/util/xp/ut_png.cpp.orig (-1 / +1 lines)
71	* the normal method of doing things with libpng). REQUIRED unless you	71	* the normal method of doing things with libpng). REQUIRED unless you
72	* set up your own error handlers in the png_create_read_struct() earlier.	72	* set up your own error handlers in the png_create_read_struct() earlier.
73	*/	73	*/
74	if (setjmp(png_ptr->jmpbuf))	74	if (setjmp(png_jmpbuf(png_ptr)))
75	{	75	{
76	/* Free all of the memory associated with the png_ptr and info_ptr */	76	/* Free all of the memory associated with the png_ptr and info_ptr */
77	png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));	77	png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));

Return to bug 383567