upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-27 03:50:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #37156 from nextcloud/backport/37140/stable25

Browse source 
[stable25] imaginary - fix autorotate for heic and improve the logic
This commit is contained in:
Simon L 2023-03-10 16:17:30 +01:00 committed by GitHub
commit 8b088b3e33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
lib/private/Preview/Imaginary.php
View file

@ -82,8 +82,14 @@ class Imaginary extends ProviderV2 {
$httpClient = $this->service->newClient();
$convert = false;
$autorotate = true;
switch ($file->getMimeType()) {
case 'image/heic':
// Autorotate seems to be broken for Heic so disable for that
$autorotate = false;
$mimeType = 'jpeg';
break;
case 'image/gif':
case 'image/png':
$mimeType = 'png';
@ -92,50 +98,43 @@ class Imaginary extends ProviderV2 {
case 'application/pdf':
case 'application/illustrator':
$convert = true;
// Converted files do not need to be autorotated
$autorotate = false;
$mimeType = 'png';
break;
default:
$mimeType = 'jpeg';
}
$operations = [];
if ($convert) {
$operations = [
[
'operation' => 'convert',
'params' => [
'type' => 'png',
]
],
[
'operation' => ($crop ? 'smartcrop' : 'fit'),
'params' => [
'width' => $maxX,
'height' => $maxY,
'type' => 'png',
'norotation' => 'true',
]
$operations[] = [
'operation' => 'convert',
'params' => [
'type' => $mimeType,
]
];
} else {
$quality = $this->config->getAppValue('preview', 'jpeg_quality', '80');
$operations = [
[
'operation' => 'autorotate',
],
[
'operation' => ($crop ? 'smartcrop' : 'fit'),
'params' => [
'width' => $maxX,
'height' => $maxY,
'stripmeta' => 'true',
'type' => $mimeType,
'norotation' => 'true',
'quality' => $quality,
]
]
} elseif ($autorotate) {
$operations[] = [
'operation' => 'autorotate',
];
}
$quality = $this->config->getAppValue('preview', 'jpeg_quality', '80');
$operations[] = [
'operation' => ($crop ? 'smartcrop' : 'fit'),
'params' => [
'width' => $maxX,
'height' => $maxY,
'stripmeta' => 'true',
'type' => $mimeType,
'norotation' => 'true',
'quality' => $quality,
]
];
try {
$response = $httpClient->post(
$imaginaryUrl . '/pipeline', [