thumb: apply exif orientation

[minimedit.git] / thumb / index.php

diff --git a/thumb/index.php b/thumb/index.php
index 24f46ccb97ab44ea5125c48d63dc18a03283d4bd..63812591820b30be0d43ec92c6baf420f6257d36 100644 (file)
--- a/thumb/index.php
+++ b/thumb/index.php
@@ -1,6 +1,4 @@
 <?php
-ob_clean();
-
 list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
 $imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
 
@@ -17,9 +15,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;
@@ -28,6 +26,7 @@ catch (Throwable $e) {
        exit;
 }
 
+header('Cache-Control: max-age=2628000');
 header('Content-type: '.mime_content_type($target));
 readfile($target);
 exit;
@@ -88,9 +87,15 @@ function mkthumb_exec($source, $target, $width, $height)
        }
        $cmd = implode(' ', array_map('escapeshellarg', [
                'convert',
+               '-delete', '1--1', # static
                '-trim',
+               '-background', 'white', '-layers', 'flatten', # opaque
+               '-auto-orient', # apply exif rotation
+               '-interlace', 'plane', # progressive
+               '-strip', '-taint', # omit metadata
+               '-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
                '-resize', "${width}x${height}",
-               '-quality', '90%',
+               '-quality', '85%',
                $source, "jpg:$target"
        ]));
        $return = shell_exec("$cmd 2>&1");