thumb: flatten transparent images to white background

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index 24f46ccb97ab44ea5125c48d63dc18a03283d4bd..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,6 +89,7 @@ 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, "jpg:$target"