mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-24 00:35:59 +00:00
Code Issues Releases Wiki Activity

Update Image util

Browse source
This commit is contained in:
Daniel Supernault 2018-11-18 21:56:22 -07:00
parent de11fa90af
commit 46fdcf0718
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Util/Media/Image.php
View file

@ -15,7 +15,7 @@ class Image
public $orientation; public $orientation;
public $acceptedMimes = [ public $acceptedMimes = [
'image/png', 'image/png',
'image/jpeg', 'image/jpeg'
]; ];
public function __construct() public function __construct()
@ -114,9 +114,11 @@ class Image
if($thumbnail) { if($thumbnail) {
$img->crop($aspect['width'], $aspect['height']); $img->crop($aspect['width'], $aspect['height']);
} else { } else {
$metadata = $img->exif();
$img->resize($aspect['width'], $aspect['height'], function ($constraint) { $img->resize($aspect['width'], $aspect['height'], function ($constraint) {
$constraint->aspectRatio(); $constraint->aspectRatio();
}); });
$media->metadata = json_encode($metadata);
} }
$converted = $this->setBaseName($path, $thumbnail, $img->extension); $converted = $this->setBaseName($path, $thumbnail, $img->extension);
$newPath = storage_path('app/'.$converted['path']); $newPath = storage_path('app/'.$converted['path']);