Merge branch 'master' into prepare-reorder

This commit is contained in:
John Cupitt 2017-01-15 10:40:25 +00:00
commit 84270ce787
1 changed files with 12 additions and 1 deletions

View File

@ -237,7 +237,18 @@ write_webp( WebPPicture *pic, VipsImage *in,
WebPConfig config;
webp_import import;
if ( !WebPConfigPreset( &config, get_preset( preset ), Q ) ) {
if( !WebPConfigInit( &config ) ) {
vips_error( "vips2webp",
"%s", _( "config version error" ) );
return( -1 );
}
/* These presets are only for lossy compression. There seems to be
* separate API for lossless or near-lossless, see
* WebPConfigLosslessPreset().
*/
if( !(lossless || near_lossless) &&
!WebPConfigPreset( &config, get_preset( preset ), Q ) ) {
vips_error( "vips2webp", "%s", _( "config version error" ) );
return( -1 );
}