mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

Fixes #2981 - Removed Image srcset conflicts. Improves rendering quality of fine-lined PNGs under some conditions.

Browse Source
This commit is contained in:
Cameron
2020-04-10 09:47:17 -07:00
parent 9d383566fe
commit ae1ba7ba2d
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_handlers/e_parse_class.php
View File

@@ -3036,12 +3036,12 @@ class e_parse extends e_parser
} }
elseif($multiply === '2x' || $multiply === '3x' || $multiply === '4x') elseif($multiply === '2x' || $multiply === '3x' || $multiply === '4x')
{ {
$multiply = intval($multiply); $multiInt = (int) $multiply;
if(empty($parm['w']) && isset($parm['h'])) if(empty($parm['w']) && isset($parm['h']))
{ {
$parm['h'] = ($parm['h'] * $multiply) ; $parm['h'] = ($parm['h'] * $multiInt) ;
return $this->thumbUrl($src, $parm)." ".$parm['h']."h ".$multiply; return $this->thumbUrl($src, $parm)." ".$multiply;
} }
if(isset($parm['w']) && !isset($parm['h'])) // if w set, assume h value of 0 is set. if(isset($parm['w']) && !isset($parm['h'])) // if w set, assume h value of 0 is set.
@@ -3049,8 +3049,8 @@ class e_parse extends e_parser
$parm['h'] = 0; $parm['h'] = 0;
} }
$width = !empty($parm['w']) ? (intval($parm['w']) * $multiply) : (intval($this->thumbWidth) * $multiply); $width = !empty($parm['w']) ? (intval($parm['w']) * $multiInt) : (intval($this->thumbWidth) * $multiInt);
$height = isset($parm['h']) ? (intval($parm['h']) * $multiply) : (intval($this->thumbHeight) * $multiply); $height = isset($parm['h']) ? (intval($parm['h']) * $multiInt) : (intval($this->thumbHeight) * $multiInt);
} }
else else
@@ -3092,8 +3092,11 @@ class e_parse extends e_parser
return $this->thumbUrl($src, $parms); return $this->thumbUrl($src, $parms);
} }
return $this->thumbUrl($src, $parms)." ".$width."w"; $ret = $this->thumbUrl($src, $parms);
$ret .= ($multiply) ? " ".$multiply : " ".$width."w";
return $ret;
} }