Merge branch '8.8'

This commit is contained in:
John Cupitt 2019-07-07 13:12:51 +01:00
commit c7f98ad0a5
3 changed files with 15 additions and 2 deletions

View File

@ -21,6 +21,8 @@ magic number [przemyslawpluta]
- fix vipsthumbnail with pyr tiff [kleisauke] - fix vipsthumbnail with pyr tiff [kleisauke]
- text autofit could occasionally terminate early [levmorozov] - text autofit could occasionally terminate early [levmorozov]
- fewer warnings on tiffload [chregu] - fewer warnings on tiffload [chregu]
- vips_resize() breaks aspect ratio and limits shrink to prevent <1px
dimensions [lovell]
21/9/18 started 8.8.0 21/9/18 started 8.8.0
- much faster smartcrop [lovell] - much faster smartcrop [lovell]

View File

@ -31,6 +31,8 @@
* 3/12/18 [edwjusti] * 3/12/18 [edwjusti]
* - disable the centre sampling offset for nearest upscale, since the * - disable the centre sampling offset for nearest upscale, since the
* affine nearest interpolator is always centre * affine nearest interpolator is always centre
* 7/7/19 [lovell]
* - don't let either axis drop below 1px
*/ */
/* /*
@ -213,6 +215,11 @@ vips_resize_build( VipsObject *object )
hscale *= int_hshrink; hscale *= int_hshrink;
} }
/* Don't let either axis drop below 1 px.
*/
hscale = VIPS_MAX( hscale, 1.0 / in->Xsize );
vscale = VIPS_MAX( vscale, 1.0 / in->Ysize );
/* Any residual downsizing. /* Any residual downsizing.
*/ */
if( vscale < 1.0 ) { if( vscale < 1.0 ) {
@ -424,6 +431,10 @@ vips_resize_init( VipsResize *resize )
* @vscale, that factor is used for the vertical scale and @scale for the * @vscale, that factor is used for the vertical scale and @scale for the
* horizontal. * horizontal.
* *
* If either axis would drop below 1px in size, the shrink in that dimension
* is limited. This breaks the image aspect ratio, but prevents errors due to
* fractional pixel sizes.
*
* This operation does not change xres or yres. The image resolution needs to * This operation does not change xres or yres. The image resolution needs to
* be updated by the application. * be updated by the application.
* *

View File

@ -186,7 +186,7 @@ libvips/foreign/gifload.c
libvips/foreign/magick7load.c libvips/foreign/magick7load.c
libvips/foreign/openslide2vips.c libvips/foreign/openslide2vips.c
libvips/foreign/exif.c libvips/foreign/exif.c
libvips/foreign/pdfload_pdfium.c libvips/foreign/pdfiumload.c
libvips/foreign/fitssave.c libvips/foreign/fitssave.c
libvips/foreign/pdfload.c libvips/foreign/pdfload.c
libvips/foreign/magick2vips.c libvips/foreign/magick2vips.c