From 30818216362efdad546622fafb637a60ccbba249 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Mon, 12 Sep 2022 10:38:17 +0100 Subject: [PATCH] revert dhint check We added a check that loader ->header() and ->load() methods set the same dhint. This commit removes that check -- it's not possible to make header and load match in all cases since images can take so many routes, and can change between the two events. If we see performance issues around inappropriate cache sizing again, try to fix just those cases. --- libvips/foreign/foreign.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c index 3e11d0a5..4a90fca0 100644 --- a/libvips/foreign/foreign.c +++ b/libvips/foreign/foreign.c @@ -932,15 +932,11 @@ vips_foreign_load_temp( VipsForeignLoad *load ) static gboolean vips_foreign_load_iscompat( VipsImage *a, VipsImage *b ) { - /* dhint must match too, or we can get terrible performance with some - * formats. - */ if( a->Xsize != b->Xsize || a->Ysize != b->Ysize || a->Bands != b->Bands || a->Coding != b->Coding || - a->BandFmt != b->BandFmt || - a->dhint != b->dhint ) { + a->BandFmt != b->BandFmt ) { vips_error( "VipsForeignLoad", "%s", _( "images do not match between header and load" ) ); return( FALSE );