aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-06-26 17:19:32 -0700
committerzotlabs <mike@macgirvin.com>2018-06-26 17:19:32 -0700
commit156010050c874eb51f8d2b2334d36909f99e732c (patch)
tree1aae6de1e8bd990ebe911300b7cefe8d975e5059 /include
parent524551a05c9ea7436afc713e2564aacd9276541e (diff)
downloadvolse-hubzilla-156010050c874eb51f8d2b2334d36909f99e732c.tar.gz
volse-hubzilla-156010050c874eb51f8d2b2334d36909f99e732c.tar.bz2
volse-hubzilla-156010050c874eb51f8d2b2334d36909f99e732c.zip
imagick converter: -thumbnail doesn't preserve exif, -resize does
Diffstat (limited to 'include')
-rw-r--r--include/photos.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/photos.php b/include/photos.php
index 9fb872700..d0c5f77fc 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -80,8 +80,8 @@ function photo_upload($channel, $observer, $args) {
if($imagick_path && @file_exists($imagick_path)) {
$tmp_name = $args['os_syspath'] . '-001';
$newsize = photo_calculate_scale(array_merge($args['getimagesize'],['max' => $max_thumb]));
- $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $args['os_syspath']) . ' -thumbnail ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
- // logger('imagick thumbnail command: ' . $cmd);
+ $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $args['os_syspath']) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
+ logger('imagick thumbnail command: ' . $cmd);
for($x = 0; $x < 4; $x ++) {
exec($cmd);
if(file_exists($tmp_name)) {
@@ -97,7 +97,7 @@ function photo_upload($channel, $observer, $args) {
$imagedata = @file_get_contents($tmp_name);
$filesize = @filesize($args['os_syspath']);
- @unlink($tmp_name);
+// @unlink($tmp_name);
}
else {
$imagedata = @file_get_contents($args['os_syspath']);