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

Merge branch '8.8'

This commit is contained in:
John Cupitt 2019-08-27 18:05:58 +01:00
parent 2f6cc1fad9 378537121f
commit e129d85330
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libvips/resample/thumbnail.c
View File

@ -370,11 +370,20 @@ vips_thumbnail_calculate_common_shrink( VipsThumbnail *thumbnail,
{ {
double hshrink; double hshrink;
double vshrink; double vshrink;
double shrink;
vips_thumbnail_calculate_shrink( thumbnail, width, height, vips_thumbnail_calculate_shrink( thumbnail, width, height,
&hshrink, &vshrink ); &hshrink, &vshrink );
return( VIPS_MIN( hshrink, vshrink ) ); shrink = VIPS_MIN( hshrink, vshrink );
/* We don't want to shrink so much that we send an axis to 0.
*/
if( shrink > thumbnail->input_width ||
shrink > thumbnail->input_height )
shrink = 1.0;
return( shrink );
} }
/* Find the best jpeg preload shrink. /* Find the best jpeg preload shrink.
@ -474,17 +483,13 @@ vips_thumbnail_open( VipsThumbnail *thumbnail )
thumbnail->loader ) ) thumbnail->loader ) )
factor = vips_thumbnail_find_pyrlevel( thumbnail, factor = vips_thumbnail_find_pyrlevel( thumbnail,
thumbnail->input_width, thumbnail->input_height ); thumbnail->input_width, thumbnail->input_height );
else if( vips_isprefix( "VipsForeignLoadPdf", thumbnail->loader ) ) else if( vips_isprefix( "VipsForeignLoadPdf", thumbnail->loader ) ||
factor = 1.0 / vips_isprefix( "VipsForeignLoadWebp", thumbnail->loader ) ||
vips_thumbnail_calculate_common_shrink( thumbnail, vips_isprefix( "VipsForeignLoadSvg", thumbnail->loader ) )
factor = vips_thumbnail_calculate_common_shrink( thumbnail,
thumbnail->input_width, thumbnail->input_width,
thumbnail->page_height ); thumbnail->page_height );
else if( vips_isprefix( "VipsForeignLoadSvg", thumbnail->loader ) ) if( vips_isprefix( "VipsForeignLoadHeif", thumbnail->loader ) ) {
factor = 1.0 /
vips_thumbnail_calculate_common_shrink( thumbnail,
thumbnail->input_width,
thumbnail->input_height );
else if( vips_isprefix( "VipsForeignLoadHeif", thumbnail->loader ) ) {
/* 'factor' is a gboolean which enables thumbnail load instead /* 'factor' is a gboolean which enables thumbnail load instead
* of image load. * of image load.
* *
@ -495,19 +500,7 @@ vips_thumbnail_open( VipsThumbnail *thumbnail )
factor = 1.0; factor = 1.0;
else else
factor = 0.0; factor = 0.0;
} }
else if( vips_isprefix( "VipsForeignLoadWebp", thumbnail->loader ) )
factor = 1.0 /
vips_thumbnail_calculate_common_shrink( thumbnail,
thumbnail->input_width,
thumbnail->page_height );
/* We don't want to pre-shrink so much that we send an axis to 0.
*/
if( factor > thumbnail->input_width ||
factor > thumbnail->input_height )
factor = 1.0;
g_info( "loading with factor %g pre-shrink", factor ); g_info( "loading with factor %g pre-shrink", factor );
@ -947,7 +940,7 @@ vips_thumbnail_file_open( VipsThumbnail *thumbnail, double factor )
vips_isprefix( "VipsForeignLoadWebp", thumbnail->loader ) ) { vips_isprefix( "VipsForeignLoadWebp", thumbnail->loader ) ) {
return( vips_image_new_from_file( file->filename, return( vips_image_new_from_file( file->filename,
"access", VIPS_ACCESS_SEQUENTIAL, "access", VIPS_ACCESS_SEQUENTIAL,
"scale", factor, "scale", 1.0 / factor,
NULL ) ); NULL ) );
} }
else if( vips_isprefix( "VipsForeignLoadTiff", thumbnail->loader ) ) { else if( vips_isprefix( "VipsForeignLoadTiff", thumbnail->loader ) ) {
@ -1145,7 +1138,7 @@ vips_thumbnail_buffer_open( VipsThumbnail *thumbnail, double factor )
buffer->buf->data, buffer->buf->length, buffer->buf->data, buffer->buf->length,
buffer->option_string, buffer->option_string,
"access", VIPS_ACCESS_SEQUENTIAL, "access", VIPS_ACCESS_SEQUENTIAL,
"scale", factor, "scale", 1.0 / factor,
NULL ) ); NULL ) );
} }
else if( vips_isprefix( "VipsForeignLoadTiff", thumbnail->loader ) ) { else if( vips_isprefix( "VipsForeignLoadTiff", thumbnail->loader ) ) {