Attachment #263275 for bug #355845

View | Details | Raw Unified | Return to bug 355845
Collapse All | Expand All

Lines 1443-1449 Link Here

(-)inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp (-1 / +1 lines)
1443	return NULL;	1443	return NULL;
1444	}	1444	}
1445	// Set error handler	1445	// Set error handler
1446	if (setjmp(png_ptr->jmpbuf)) {	1446	if (setjmp(png_jmpbuf(png_ptr))) {
1447	png_destroy_write_struct(&png_ptr, &info_ptr);	1447	png_destroy_write_struct(&png_ptr, &info_ptr);
1448	return NULL;	1448	return NULL;
1449	}	1449	}

Lines 165-171 Link Here

(-)inkscape-0.48.1/src/helper/png-write.cpp (-1 / +1 lines)
165	/* Set error handling. REQUIRED if you aren't supplying your own	165	/* Set error handling. REQUIRED if you aren't supplying your own
166	* error hadnling functions in the png_create_write_struct() call.	166	* error hadnling functions in the png_create_write_struct() call.
167	*/	167	*/
168	if (setjmp(png_ptr->jmpbuf)) {	168	if (setjmp(png_jmpbuf(png_ptr))) {
169	/* If we get here, we had a problem reading the file */	169	/* If we get here, we had a problem reading the file */
170	fclose(fp);	170	fclose(fp);
171	png_destroy_write_struct(&png_ptr, &info_ptr);	171	png_destroy_write_struct(&png_ptr, &info_ptr);

Lines 386-394 Link Here

(-)inkscape-0.48.1/src/sp-image.cpp (-2 / +6 lines)
386		386
387	#if defined(PNG_iCCP_SUPPORTED)	387	#if defined(PNG_iCCP_SUPPORTED)
388	{	388	{
389	char* name = 0;	389	png_charp name = 0;
390	int compression_type = 0;	390	int compression_type = 0;
391	char* profile = 0;	391	#if (PNG_LIBPNG_VER < 10500)
		392	png_charp profile = 0;
		393	#else
		394	png_bytep profile = 0;
		395	#endif
392	png_uint_32 proflen = 0;	396	png_uint_32 proflen = 0;
393	if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {	397	if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
394	// g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);	398	// g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);

Return to bug 355845