harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imagick converter: -thumbnail doesn't preserve exif, -resize does

Browse Source
This commit is contained in:
zotlabs 2018-06-26 17:19:32 -07:00
parent 524551a05c
commit 156010050c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Cover_photo.php
View File

@ -95,7 +95,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
$fname = dbunescbin($r[0]['content']); $fname = dbunescbin($r[0]['content']);
$tmp_name = $fname . '-001'; $tmp_name = $fname . '-001';
$newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb])); $newsize = photo_calculate_scale(array_merge(getimagesize($fname),['max' => $max_thumb]));
$cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -thumbnail ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name); $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $fname) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
// logger('imagick thumbnail command: ' . $cmd); // logger('imagick thumbnail command: ' . $cmd);
for($x = 0; $x < 4; $x ++) { for($x = 0; $x < 4; $x ++) {
exec($cmd); exec($cmd);

2
Zotlabs/Thumbs/Pdf.php
View File

@ -27,7 +27,7 @@ class Pdf {
$imagick_path = get_config('system','imagick_convert_path'); $imagick_path = get_config('system','imagick_convert_path');
if($imagick_path && @file_exists($imagick_path)) { if($imagick_path && @file_exists($imagick_path)) {
$cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -thumbnail ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -resize ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile);
// logger('imagick thumbnail command: ' . $cmd); // logger('imagick thumbnail command: ' . $cmd);
for($x = 0; $x < 4; $x ++) { for($x = 0; $x < 4; $x ++) {
exec($cmd); exec($cmd);

2
Zotlabs/Thumbs/Video.php
View File

@ -46,7 +46,7 @@ class Video {
$imagick_path = get_config('system','imagick_convert_path'); $imagick_path = get_config('system','imagick_convert_path');
if($imagick_path && @file_exists($imagick_path)) { if($imagick_path && @file_exists($imagick_path)) {
$cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -thumbnail ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -resize ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile);
// logger('imagick thumbnail command: ' . $cmd); // logger('imagick thumbnail command: ' . $cmd);
/** @scrutinizer ignore-unhandled */ /** @scrutinizer ignore-unhandled */

6
include/photos.php
View File

@ -80,8 +80,8 @@ function photo_upload($channel, $observer, $args) {
if($imagick_path && @file_exists($imagick_path)) { if($imagick_path && @file_exists($imagick_path)) {
$tmp_name = $args['os_syspath'] . '-001'; $tmp_name = $args['os_syspath'] . '-001';
$newsize = photo_calculate_scale(array_merge($args['getimagesize'],['max' => $max_thumb])); $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); $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $args['os_syspath']) . ' -resize ' . $newsize . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmp_name);
// logger('imagick thumbnail command: ' . $cmd); logger('imagick thumbnail command: ' . $cmd);
for($x = 0; $x < 4; $x ++) { for($x = 0; $x < 4; $x ++) {
exec($cmd); exec($cmd);
if(file_exists($tmp_name)) { if(file_exists($tmp_name)) {
@ -97,7 +97,7 @@ function photo_upload($channel, $observer, $args) {
$imagedata = @file_get_contents($tmp_name); $imagedata = @file_get_contents($tmp_name);
$filesize = @filesize($args['os_syspath']); $filesize = @filesize($args['os_syspath']);
@unlink($tmp_name); // @unlink($tmp_name);
} }
else { else {
$imagedata = @file_get_contents($args['os_syspath']); $imagedata = @file_get_contents($args['os_syspath']);