mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix svg resizing and remove deprecated method call 

Signed-off-by: Julius Haertl <jus@bitgrid.net>
This commit is contained in:
Julius Haertl 2016-10-14 21:42:25 +02:00
parent 2e8dd21815
commit 43097eabee
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/theming/lib/IconBuilder.php
View File

@ -104,13 +104,20 @@ class IconBuilder {
$res = $tmp->getImageResolution();
$tmp->destroy();
if($x>$y) {
$max = $x;
} else {
$max = $y;
}
// convert svg to resized image
$appIconFile = new Imagick();
$resX = (int)(512 * $res['x'] / $x * 2.53);
$resY = (int)(512 * $res['y'] / $y * 2.53);
$resX = (int)(512 * $res['x'] / $max * 2.53);
$resY = (int)(512 * $res['y'] / $max * 2.53);
$appIconFile->setResolution($resX, $resY);
$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
$appIconFile->readImageBlob($svg);
$appIconFile->scaleImage(512, 512, true);
} else {
$appIconFile = new Imagick();
$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));

4
apps/theming/lib/ThemingDefaults.php
View File

@ -157,8 +157,8 @@ class ThemingDefaults extends \OC_Defaults {
*/
public function shouldReplaceIcons() {
$cache = $this->cacheFactory->create('theming');
if($cache->hasKey('shouldReplaceIcons')) {
return (bool)$cache->get('shouldReplaceIcons');
if($value = $cache->get('shouldReplaceIcons')) {
return (bool)$value;
}
$value = false;
if(extension_loaded('imagick')) {