Merge branch '8.5'

This commit is contained in:
John Cupitt 2017-08-18 22:13:51 +01:00
commit 97997d1990
2 changed files with 6 additions and 3 deletions

View File

@ -17,6 +17,7 @@
- fix transparency detection in merge, thanks Haida
- define env var VIPS_WARNING to hide warning messages
- shut down dzsave output earlier to help mark-sweep bindings
- fix webp thumbnail upscale, thanks Kleis
9/6/17 started 8.5.7
- better smartcrop

View File

@ -285,10 +285,12 @@ vips_thumbnail_open( VipsThumbnail *thumbnail )
g_info( "loading PDF/SVG with factor %g pre-scale", scale );
}
else if( vips_isprefix( "VipsForeignLoadWebp", thumbnail->loader ) ) {
shrink = vips_thumbnail_calculate_common_shrink( thumbnail,
thumbnail->input_width, thumbnail->input_height );
shrink = VIPS_MAX( 1.0,
vips_thumbnail_calculate_common_shrink( thumbnail,
thumbnail->input_width,
thumbnail->input_height ) );
g_info( "loading webp with factor %g pre-shrink", shrink );
g_info( "loading webp with factor %d pre-shrink", shrink );
}
if( !(im = class->open( thumbnail, shrink, scale )) )