git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thumb: only shrink larger images
[minimedit.git]
/
thumb
/
index.php
diff --git
a/thumb/index.php
b/thumb/index.php
index c65cab3dab9ea7ebb2227ded9e4a2b984b845d7e..bd08d8841497d266a1b573d172431f96981e2b0c 100644
(file)
--- a/
thumb/index.php
+++ b/
thumb/index.php
@@
-1,5
+1,10
@@
<?php
<?php
-list ($size, $imgpath) = explode('/', ltrim($Args, '/'), 2);
+if (!$User) return;
+$imgpath = ltrim($Page->path, '/');
+if (!preg_match('{^[0-9x]+/}', $imgpath)) {
+ return;
+}
+list ($size, $imgpath) = explode('/', $imgpath, 2);
$imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
if (!file_exists($imgpath)) {
$imgpath = preg_replace('{^(?=[0-9]+/)}', 'data/', $imgpath, 1);
if (!file_exists($imgpath)) {
@@
-90,8
+95,11
@@
function mkthumb_exec($source, $target, $width, $height)
'-delete', '1--1', # static
'-trim',
'-background', 'white', '-layers', 'flatten', # opaque
'-delete', '1--1', # static
'-trim',
'-background', 'white', '-layers', 'flatten', # opaque
+ '-auto-orient', # apply exif rotation
'-interlace', 'plane', # progressive
'-interlace', 'plane', # progressive
- '-resize', "${width}x${height}",
+ '-strip', '-taint', # omit metadata
+ '-sampling-factor', '4:2:0', '-colorspace', 'sRGB', # half chroma
+ '-resize', "${width}x${height}>",
'-quality', '85%',
$source, "jpg:$target"
]));
'-quality', '85%',
$source, "jpg:$target"
]));