diff --git a/apps/theming/lib/ImageManager.php b/apps/theming/lib/ImageManager.php index 3b99402d577..ad1c1055806 100644 --- a/apps/theming/lib/ImageManager.php +++ b/apps/theming/lib/ImageManager.php @@ -265,12 +265,7 @@ class ImageManager { } } $tmpFile = $newTmpFile; - imagedestroy($outputImage); } catch (\Exception $e) { - if (isset($outputImage) && is_resource($outputImage) || $outputImage instanceof \GdImage) { - imagedestroy($outputImage); - } - $this->logger->debug($e->getMessage()); } } diff --git a/lib/private/Image.php b/lib/private/Image.php index 2ab199e69c6..d1a2f164ed5 100644 --- a/lib/private/Image.php +++ b/lib/private/Image.php @@ -508,7 +508,6 @@ class Image implements IImage { if ($res) { if (imagealphablending($res, true)) { if (imagesavealpha($res, true)) { - imagedestroy($this->resource); $this->resource = $res; return true; } else { @@ -926,7 +925,6 @@ class Image implements IImage { $res = imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig); if ($res === false) { $this->logger->debug(__METHOD__ . '(): Error re-sampling process image', ['app' => 'core']); - imagedestroy($process); return false; } return $process; @@ -988,7 +986,6 @@ class Image implements IImage { $this->logger->debug('Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, ['app' => 'core']); return false; } - imagedestroy($this->resource); $this->resource = $process; return true; } @@ -1009,7 +1006,6 @@ class Image implements IImage { return false; } $result = $this->cropNew($x, $y, $w, $h); - imagedestroy($this->resource); $this->resource = $result; return $this->valid(); }