Merge pull request #6210 from caplod/feature/imagemagick-thread

Add option to change number of threads for imagemagick convert
getkirby · Feb 1, 2024 · 589e5bf · 589e5bf
2 parents 5c46047 + 98dbc5e
commit 589e5bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Image/Darkroom/ImageMagick.php b/src/Image/Darkroom/ImageMagick.php
@@ -62,8 +62,8 @@ protected function convert(string $file, array $options): string
 	{
 		$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 @@ protected function defaults(): array
 		return parent::defaults() + [
 			'bin'       => 'convert',
 			'interlace' => false,
+			'threads'   => 1,
 		];
 	}
 

diff --git a/tests/Image/Darkroom/ImageMagickTest.php b/tests/Image/Darkroom/ImageMagickTest.php
@@ -45,6 +45,7 @@ public function testProcess()
 			'width' => 500,
 			'bin' => 'convert',
 			'interlace' => false,
+			'threads' => 1,
 			'sourceWidth' => 500,
 			'sourceHeight' => 500
 		], $im->process($file));