aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2020-05-02 21:57:34 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2020-05-02 21:57:34 +0200
commit0c35aaba2994c2a043f48b5cf74a224c96032284 (patch)
treeb5c54a641dee129540afc6b11e1b733fc7a9f9cd
parent5ca0ffbcf036ce6119d0b4fa9d65352aa2865d07 (diff)
downloadnextcloud-server-0c35aaba2994c2a043f48b5cf74a224c96032284.tar.gz
nextcloud-server-0c35aaba2994c2a043f48b5cf74a224c96032284.zip
Fix OC_Image new resize functions
Else the wrong mimetype might be set. Resulting in continious regeneration of previews when browsing. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
-rw-r--r--lib/private/legacy/OC_Image.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index 9ef77e3d4c6..4fdbfb3909f 100644
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -1101,6 +1101,9 @@ class OC_Image implements \OCP\IImage {
public function cropCopy(int $x, int $y, int $w, int $h): IImage {
$image = new OC_Image(null, $this->logger, $this->config);
+ $image->imageType = $this->imageType;
+ $image->mimeType = $this->mimeType;
+ $image->bitDepth = $this->bitDepth;
$image->resource = $this->cropNew($x, $y, $w, $h);
return $image;
@@ -1108,6 +1111,9 @@ class OC_Image implements \OCP\IImage {
public function preciseResizeCopy(int $width, int $height): IImage {
$image = new OC_Image(null, $this->logger, $this->config);
+ $image->imageType = $this->imageType;
+ $image->mimeType = $this->mimeType;
+ $image->bitDepth = $this->bitDepth;
$image->resource = $this->preciseResizeNew($width, $height);
return $image;
@@ -1115,6 +1121,9 @@ class OC_Image implements \OCP\IImage {
public function resizeCopy(int $maxSize): IImage {
$image = new OC_Image(null, $this->logger, $this->config);
+ $image->imageType = $this->imageType;
+ $image->mimeType = $this->mimeType;
+ $image->bitDepth = $this->bitDepth;
$image->resource = $this->resizeNew($maxSize);
return $image;