thumb: flatten transparent images to white background

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index 2a8e30303f7abf9482dca27e6f57e5cf9110aa5d..f15a180b1e8e89983eea66d5430f7ee7fc19e159 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -17,9 +17,9 @@ try {
 }
 catch (Throwable $e) {
        http_response_code($e->getCode() ?: 500);
+       header("X-Error: ".explode("\n", $e->getMessage())[0], FALSE);
        $target = '500.png';
        if (file_exists($target)) {
-               header("X-Error: ".$e->getMessage());
                header('Content-type: '.mime_content_type($target));
                readfile($target);
                exit;
@@ -89,9 +89,10 @@ function mkthumb_exec($source, $target, $width, $height)
        $cmd = implode(' ', array_map('escapeshellarg', [
                'convert',
                '-trim',
+               '-background', 'white', '-layers', 'flatten',
                '-resize', "${width}x${height}",
                '-quality', '90%',
-               $source, $target
+               $source, "jpg:$target"
        ]));
        $return = shell_exec("$cmd 2>&1");
        if ($return) {