Upgrade to 4.2.0

2024-04-10 11:09:52 +02:00
parent 77d9337371
commit 7f4eb7509d
88 changed files with 1187 additions and 490 deletions
--- a/kirby/src/Image/Darkroom/ImageMagick.php
+++ b/kirby/src/Image/Darkroom/ImageMagick.php
@@ -62,8 +62,8 @@ class ImageMagick extends Darkroom
 	{
 		$command = escapeshellarg($options['bin']);

-		// limit to single-threading to keep CPU usage sane
-		$command .= ' -limit thread 1';
+		// default is limiting to single-threading to keep CPU usage sane
+		$command .= ' -limit thread ' . escapeshellarg($options['threads']);

 		// append input file
 		return $command . ' ' . escapeshellarg($file);
@@ -77,6 +77,7 @@ class ImageMagick extends Darkroom
 		return parent::defaults() + [
 			'bin'       => 'convert',
 			'interlace' => false,
+			'threads'   => 1,
 		];
 	}