upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

fix(preview): webp preview format

Browse source 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
This commit is contained in:
Richard Steinmetz 2024-03-26 09:58:36 +01:00
parent 47ac907149
commit e9c0d0e67f
No known key found for this signature in database
GPG key ID: 27137D9E7D273FB2
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/private/legacy/OC_Image.php
View file

@ -27,6 +27,7 @@ declare(strict_types=1);
* @author Samuel CHEMLA <chemla.samuel@gmail.com>
* @author Thomas Müller <thomas.mueller@tmit.eu>
* @author Thomas Tanghus <thomas@tanghus.net>
* @author Richard Steinmetz <richard@steinmetz.cloud>
*
* @license AGPL-3.0
*
@ -55,6 +56,9 @@ class OC_Image implements \OCP\IImage {
// Default quality for jpeg images
protected const DEFAULT_JPEG_QUALITY = 80;
// Default quality for webp images
protected const DEFAULT_WEBP_QUALITY = 80;
/** @var false|resource|\GdImage */
protected $resource = false; // tmp resource.
/** @var int */
@ -283,6 +287,9 @@ class OC_Image implements \OCP\IImage {
case 'image/x-ms-bmp':
$imageType = IMAGETYPE_BMP;
break;
case 'image/webp':
$imageType = IMAGETYPE_WEBP;
break;
default:
throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
}
@ -314,6 +321,9 @@ class OC_Image implements \OCP\IImage {
case IMAGETYPE_BMP:
$retVal = imagebmp($this->resource, $filePath);
break;
case IMAGETYPE_WEBP:
$retVal = imagewebp($this->resource, null, $this->getWebpQuality());
break;
default:
$retVal = imagepng($this->resource, $filePath);
}
@ -364,6 +374,7 @@ class OC_Image implements \OCP\IImage {
case 'image/png':
case 'image/jpeg':
case 'image/gif':
case 'image/webp':
return $this->mimeType;
default:
return 'image/png';
@ -391,6 +402,9 @@ class OC_Image implements \OCP\IImage {
case "image/gif":
$res = imagegif($this->resource);
break;
case "image/webp":
$res = imagewebp($this->resource, null, $this->getWebpQuality());
break;
default:
$res = imagepng($this->resource);
$this->logger->info('OC_Image->data. Could not guess mime-type, defaulting to png', ['app' => 'core']);
@ -421,6 +435,18 @@ class OC_Image implements \OCP\IImage {
return min(100, max(10, (int) $quality));
}
/**
* @return int
*/
protected function getWebpQuality(): int {
$quality = $this->config->getAppValue('preview', 'webp_quality', (string) self::DEFAULT_WEBP_QUALITY);
// TODO: remove when getAppValue is type safe
if ($quality === null) {
$quality = self::DEFAULT_WEBP_QUALITY;
}
return min(100, max(10, (int) $quality));
}
/**
* (I'm open for suggestions on better method name ;)
* Get the orientation based on EXIF data.