revise heic thumbnail workaround
This commit is contained in:
parent
80abdce923
commit
1099bd068c
|
@ -285,62 +285,62 @@ vips_foreign_load_heif_get_flags( VipsForeignLoad *load )
|
||||||
static int
|
static int
|
||||||
vips_foreign_load_heif_set_thumbnail( VipsForeignLoadHeif *heif )
|
vips_foreign_load_heif_set_thumbnail( VipsForeignLoadHeif *heif )
|
||||||
{
|
{
|
||||||
double main_aspect;
|
|
||||||
double thumb_aspect;
|
|
||||||
heif_item_id thumb_ids[1];
|
heif_item_id thumb_ids[1];
|
||||||
int n_thumbs;
|
int n_thumbs;
|
||||||
struct heif_image_handle *thumb_handle;
|
struct heif_image_handle *thumb_handle;
|
||||||
struct heif_image *thumb_img;
|
struct heif_image *thumb_img;
|
||||||
struct heif_error error;
|
struct heif_error error;
|
||||||
|
double main_aspect;
|
||||||
|
double thumb_aspect;
|
||||||
|
|
||||||
/* We need the main image aspect ratio so we can sanity-check
|
n_thumbs = heif_image_handle_get_list_of_thumbnail_IDs(
|
||||||
* the thumbnail.
|
heif->handle, thumb_ids, 1 );
|
||||||
|
if( n_thumbs == 0 )
|
||||||
|
return( 0 );
|
||||||
|
|
||||||
|
error = heif_image_handle_get_thumbnail( heif->handle,
|
||||||
|
thumb_ids[0], &thumb_handle );
|
||||||
|
if( error.code ) {
|
||||||
|
vips__heif_error( &error );
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Just checking the width and height of the handle isn't
|
||||||
|
* enough -- we have to experimentally decode it and test the
|
||||||
|
* decoded dimensions.
|
||||||
*/
|
*/
|
||||||
|
error = heif_decode_image( thumb_handle, &thumb_img,
|
||||||
|
heif_colorspace_RGB,
|
||||||
|
heif_chroma_interleaved_RGB,
|
||||||
|
NULL );
|
||||||
|
if( error.code ) {
|
||||||
|
VIPS_FREEF( heif_image_handle_release, thumb_handle );
|
||||||
|
vips__heif_error( &error );
|
||||||
|
return( -1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
thumb_aspect = (double)
|
||||||
|
heif_image_get_width( thumb_img, heif_channel_interleaved ) /
|
||||||
|
heif_image_get_height( thumb_img, heif_channel_interleaved );
|
||||||
|
|
||||||
|
VIPS_FREEF( heif_image_release, thumb_img );
|
||||||
|
|
||||||
main_aspect = (double)
|
main_aspect = (double)
|
||||||
heif_image_handle_get_width( heif->handle ) /
|
heif_image_handle_get_width( heif->handle ) /
|
||||||
heif_image_handle_get_height( heif->handle );
|
heif_image_handle_get_height( heif->handle );
|
||||||
|
|
||||||
n_thumbs = heif_image_handle_get_list_of_thumbnail_IDs(
|
/* The bug we are working around has decoded thumbs as 512x512
|
||||||
heif->handle, thumb_ids, 1 );
|
* with the main image as 6kx4k, so a 0.1 threshold is more
|
||||||
|
* than tight enough to spot the error.
|
||||||
if( n_thumbs > 0 ) {
|
*/
|
||||||
error = heif_image_handle_get_thumbnail( heif->handle,
|
if( fabs( main_aspect - thumb_aspect ) > 0.1 ) {
|
||||||
thumb_ids[0], &thumb_handle );
|
VIPS_FREEF( heif_image_handle_release, thumb_handle );
|
||||||
if( error.code ) {
|
return( 0 );
|
||||||
vips__heif_error( &error );
|
|
||||||
return( -1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Just checking the width and height of the handle isn't
|
|
||||||
* enough -- we have to decode it and test the decoded
|
|
||||||
* dimensions.
|
|
||||||
*/
|
|
||||||
error = heif_decode_image( thumb_handle, &thumb_img,
|
|
||||||
heif_colorspace_RGB,
|
|
||||||
heif_chroma_interleaved_RGB,
|
|
||||||
NULL );
|
|
||||||
if( error.code ) {
|
|
||||||
vips__heif_error( &error );
|
|
||||||
return( -1 );
|
|
||||||
}
|
|
||||||
|
|
||||||
thumb_aspect = (double)
|
|
||||||
heif_image_get_width( thumb_img,
|
|
||||||
heif_channel_interleaved ) /
|
|
||||||
heif_image_get_height( thumb_img,
|
|
||||||
heif_channel_interleaved );
|
|
||||||
|
|
||||||
VIPS_FREEF( heif_image_release, thumb_img );
|
|
||||||
|
|
||||||
if( fabs( main_aspect - thumb_aspect ) < 0.1 ) {
|
|
||||||
VIPS_FREEF( heif_image_handle_release, heif->handle );
|
|
||||||
heif->handle = thumb_handle;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
VIPS_FREEF( heif_image_handle_release, thumb_handle );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
VIPS_FREEF( heif_image_handle_release, heif->handle );
|
||||||
|
heif->handle = thumb_handle;
|
||||||
|
|
||||||
return( 0 );
|
return( 0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue