tiffsave: honor disc threshold during pyramid save (#4349)

kleisauke · jcupitt · web-flow · commit 4811f1e4a8a3 · 2025-01-23T14:01:33.000Z
See: kleisauke/net-vips#245. Co-authored-by: John Cupitt <jcupitt@gmail.com>
diff --git a/ChangeLog b/ChangeLog
@@ -15,6 +15,7 @@
 - fix MSVC compile error [na-trium-144]
 - exif: ensure enumerated entries can to converted to string values [lovell]
 - gifsave: add support for eval callback, ensure correct return code [lovell]
+- tiffsave: honor disc threshold during pyramid save [kleisauke]
 - fill_nearest: fix a leak
 
 10/10/24 8.16.0
diff --git a/libvips/foreign/vips2tiff.c b/libvips/foreign/vips2tiff.c
@@ -475,9 +475,16 @@ wtiff_layer_init(Wtiff *wtiff, Layer **layer, Layer *above,
 			(*layer)->target = wtiff->target;
 			g_object_ref((*layer)->target);
 		}
-		else
-			(*layer)->target =
-				vips_target_new_temp(wtiff->target);
+		else {
+			const guint64 disc_threshold = vips_get_disc_threshold();
+			const guint64 layer_size =
+				VIPS_IMAGE_SIZEOF_PEL(wtiff->ready) * width * height;
+
+			if (layer_size > disc_threshold)
+				(*layer)->target = vips_target_new_temp(wtiff->target);
+			else
+				(*layer)->target = vips_target_new_to_memory();
+		}
 
 		/*
 		printf("wtiff_layer_init: sub = %d, width = %d, height = %d\n",
diff --git a/libvips/iofuncs/target.c b/libvips/iofuncs/target.c
@@ -382,7 +382,7 @@ vips_target_new_to_file(const char *filename)
  *
  * See also: vips_target_new_to_file().
  *
- * Returns: a new #VipsConnection
+ * Returns: a new target.
  */
 VipsTarget *
 vips_target_new_to_memory(void)

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ vips_target_new_to_file(const char *filename)`
`382`	`382`	`*`
`383`	`383`	`* See also: vips_target_new_to_file().`
`384`	`384`	`*`
`385`		`- * Returns: a new #VipsConnection`
	`385`	`+ * Returns: a new target.`
`386`	`386`	`*/`
`387`	`387`	`VipsTarget *`
`388`	`388`	`vips_target_new_to_memory(void)`