much better performance for bad aspect ratios

we were not building the right shaped pyramids for very extreme aspect
ratio images

Author: jcupitt

CHANGELOG.md

@@ -1,3 +1,8 @@
+master
+
+- much better performance for images which are very tall and thin or very wide 
+  and narrow
+
 ## 3.1.0 28/10/24
 
 - better behaviour for image interpretations like MATRIX

src/tilecache.c

@@ -1,10 +1,10 @@
 #include "vipsdisp.h"
 
 /*
-#define DEBUG
-#define DEBUG_RENDER_TIME
 #define DEBUG_VERBOSE
+#define DEBUG_RENDER_TIME
  */
+#define DEBUG
 
 enum {
 	/* Properties.
@@ -249,14 +249,15 @@ tilecache_build_pyramid(Tilecache *tilecache)
 
 	tilecache_free_pyramid(tilecache);
 
-	/* How many levels? Keep shrinking until we get down to one tile on
-	 * one axis.
+	/* How many levels? Keep shrinking until we get both axies in one tile. We
+	 * need to handle very lopsided images, like LUTs and multi-page images,
+	 * do we must shrink both dimensions.
 	 */
 	level_width = tilesource->display_width;
 	level_height = tilesource->display_height;
 	n_levels = 1;
 	for (;;) {
-		if (level_width <= TILE_SIZE ||
+		if (level_width <= TILE_SIZE &&
 			level_height <= TILE_SIZE)
 			break;
 
@@ -283,8 +284,8 @@ tilecache_build_pyramid(Tilecache *tilecache)
 			tilesource->rgb->Xres,
 			tilesource->rgb->Yres);
 
-		level_width >>= 1;
-		level_height >>= 1;
+		level_width = VIPS_MAX(1, level_width >> 1);
+		level_height = VIPS_MAX(1, level_height >> 1);
 	}
 
 	tilecache->tiles = VIPS_ARRAY(NULL, n_levels, GSList *);

src/tilesource.c

@@ -365,10 +365,14 @@ tilesource_display_image(Tilesource *tilesource, VipsImage **mask_out)
 		 * some layer other than the base one. Calculate the
 		 * subsample as (current_width / required_width).
 		 */
-		int subsample = image->Xsize /
-			(tilesource->display_width >> tilesource->current_z);
-
-		if (vips_subsample(image, &x, subsample, subsample, NULL))
+		int width = 
+			VIPS_MAX(1, tilesource->display_width >> tilesource->current_z);
+		int height = 
+			VIPS_MAX(1, tilesource->display_height >> tilesource->current_z);
+		int xfac = image->Xsize / width; 
+		int yfac = image->Ysize / height; 
+
+		if (vips_subsample(image, &x, xfac, yfac, NULL))
 			return NULL;
 		VIPS_UNREF(image);
 		image = x;