sergiotarxz/libvips
sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix pngload with libpng >=1.6.11

Browse Source 
thaks Lovell
This commit is contained in:
John Cupitt 2014-08-09 17:14:49 +01:00
parent 2e8217338b
commit 296eb8b54e
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@
- vipsthumbnail shrinks to 1/2 window_size: faster and better quality - vipsthumbnail shrinks to 1/2 window_size: faster and better quality
- vipsthumbnail defaults to bicubic + nosharpen - vipsthumbnail defaults to bicubic + nosharpen
- better rounding behaviour for fixed-point bicubic reduces noise - better rounding behaviour for fixed-point bicubic reduces noise
- fix pngload with libpng >=1.6.11
4/7/14 started 7.40.4 4/7/14 started 7.40.4
- fix vips_rawsave_fd(), thanks aferrero2707 - fix vips_rawsave_fd(), thanks aferrero2707

16
libvips/foreign/vipspng.c
View File

@ -48,6 +48,8 @@
* still set color_type to alpha * still set color_type to alpha
* 16/7/13 * 16/7/13
* - more robust error handling from libpng * - more robust error handling from libpng
* 9/8/14
* - don't check profiles, helps with libpng >=1.6.11
*/ */
/* /*
@ -188,6 +190,13 @@ read_new( VipsImage *out, gboolean readbehind )
user_error_function, user_warning_function )) ) user_error_function, user_warning_function )) )
return( NULL ); return( NULL );
#ifdef PNG_SKIP_sRGB_CHECK_PROFILE
/* Prevent libpng (>=1.6.11) verifying sRGB profiles.
*/
png_set_option( read->pPng,
PNG_SKIP_sRGB_CHECK_PROFILE, PNG_OPTION_ON );
#endif /*PNG_SKIP_sRGB_CHECK_PROFILE*/
/* Catch PNG errors from png_create_info_struct(). /* Catch PNG errors from png_create_info_struct().
*/ */
if( setjmp( png_jmpbuf( read->pPng ) ) ) if( setjmp( png_jmpbuf( read->pPng ) ) )
@ -717,6 +726,13 @@ write_new( VipsImage *in )
user_error_function, user_warning_function )) ) user_error_function, user_warning_function )) )
return( NULL ); return( NULL );
#ifdef PNG_SKIP_sRGB_CHECK_PROFILE
/* Prevent libpng (>=1.6.11) verifying sRGB profiles.
*/
png_set_option( write->pPng,
PNG_SKIP_sRGB_CHECK_PROFILE, PNG_OPTION_ON );
#endif /*PNG_SKIP_sRGB_CHECK_PROFILE*/
/* Catch PNG errors from png_create_info_struct(). /* Catch PNG errors from png_create_info_struct().
*/ */
if( setjmp( png_jmpbuf( write->pPng ) ) ) if( setjmp( png_jmpbuf( write->pPng ) ) )