[stable25] feat(theming): Only convert a background image if it benefits from it #42943
Conversation
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
* WebP images are generally quite small, converting to pngs would increase the filesize a lot. * Small JPEG and PNG images do not benefit from any conversion, so skip it. * JPEG images will get quite bigger when converted to PNG so instead convert to progressive JPEG Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
backportbot-nextcloud
bot
requested review from
juliushaertl,
skjnldsv and
susnux
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $newHeight = (int)(imagesy($newImage) / (imagesx($newImage) / $newWidth)); | ||
| $outputImage = imagescale($newImage, $newWidth, $newHeight); | ||
| $newWidth = (int)(imagesx($newImage) < 4096 ? imagesx($newImage) : 4096); | ||
| $newHeight = (int)(imagesy($newImage) / (imagesx($newImage) / $newWidth)); |
Check notice
Code scanning / Psalm
PossiblyFalseOperand Note
| $newHeight = (int)(imagesy($newImage) / (imagesx($newImage) / $newWidth)); | ||
| $outputImage = imagescale($newImage, $newWidth, $newHeight); | ||
| $newWidth = (int)(imagesx($newImage) < 4096 ? imagesx($newImage) : 4096); | ||
| $newHeight = (int)(imagesy($newImage) / (imagesx($newImage) / $newWidth)); |
Check notice
Code scanning / Psalm
PossiblyFalseOperand Note
| imagepng($outputImage, $tmpFile, 8); | ||
| imagedestroy($outputImage); | ||
| $newTmpFile = $this->tempManager->getTemporaryFile(); | ||
| imageinterlace($outputImage, 1); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| } | ||
| } | ||
| $tmpFile = $newTmpFile; | ||
| imagedestroy($outputImage); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| $tmpFile = $newTmpFile; | ||
| imagedestroy($outputImage); | ||
| } catch (\Exception $e) { | ||
| if (is_resource($outputImage) || $outputImage instanceof \GdImage) { |
Check notice
Code scanning / Psalm
DocblockTypeContradiction Note
| $tmpFile = $newTmpFile; | ||
| imagedestroy($outputImage); | ||
| } catch (\Exception $e) { | ||
| if (is_resource($outputImage) || $outputImage instanceof \GdImage) { |
Check notice
Code scanning / Psalm
DocblockTypeContradiction Note
| imagedestroy($outputImage); | ||
| } catch (\Exception $e) { | ||
| if (is_resource($outputImage) || $outputImage instanceof \GdImage) { | ||
| imagedestroy($outputImage); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| $target->putContent(file_get_contents($tmpFile)); | ||
| } else { | ||
| $target->putContent(file_get_contents($tmpFile)); | ||
| $this->logger->debug($e->getMessage()); |
Check notice
Code scanning / Psalm
DeprecatedMethod Note
| imageinterlace($outputImage, 1); | ||
| // Keep jpeg images encoded as jpeg | ||
| if (strpos($detectedMimeType, 'image/jpeg') !== false) { | ||
| if (!imagejpeg($outputImage, $newTmpFile, 90)) { |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
| throw new \Exception('Could not recompress background image as JPEG'); | ||
| } | ||
| } else { | ||
| if (!imagepng($outputImage, $newTmpFile, 8)) { |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument Note
Backport of #36471