UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3121 from inthreedee/patch-1

Browse source 
Avoid upscaling small images
This commit is contained in:
daniel 2022-01-05 18:37:13 -07:00 committed by GitHub
commit 854f858543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,8 @@ class Image
return [ return [
'dimensions' => $this->orientations()[$orientation], 'dimensions' => $this->orientations()[$orientation],
'orientation' => $orientation, 'orientation' => $orientation,
'width_original' => $width,
'height_original' => $height,
]; ];
} }
@ -157,9 +159,14 @@ class Image
$media->metadata = json_encode($meta); $media->metadata = json_encode($meta);
} }
$img->resize($aspect['width'], $aspect['height'], function ($constraint) { if (
$constraint->aspectRatio(); ($ratio['width_original'] > $aspect['width'])
}); || ($ratio['height_original'] > $aspect['height'])
) {
$img->resize($aspect['width'], $aspect['height'], function ($constraint) {
$constraint->aspectRatio();
});
}
} }
$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']);