upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #2291 from nextcloud/stable10-imagescale-fix

Browse source 
[stable10] Workaround for PHP bug when calling imagescale
This commit is contained in:
Morris Jobke 2016-11-24 12:02:36 +01:00 committed by GitHub
commit f7a505ded6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/theming/lib/Controller/ThemingController.php
View file

@ -208,7 +208,9 @@ class ThemingController extends Controller {
$tmpFile = $this->tempManager->getTemporaryFile();
if(function_exists('imagescale')) {
// FIXME: Once PHP 5.5.0 is a requirement the above check can be removed
$image = imagescale($image, 1920);
// Workaround for https://bugs.php.net/bug.php?id=65171
$newHeight = imagesy($image)/(imagesx($image)/1920);
$image = imagescale($image, 1920, $newHeight);
}
imageinterlace($image, 1);
imagejpeg($image, $tmpFile, 75);