Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Follow-up to r44651 -- stay in floats until we finish the SVG size, so aspect ratios in silly tiny units are preserved better.

Browse source
This commit is contained in:
Brion Vibber 2008-12-16 05:45:28 +00:00
parent 562fef4f58
commit c40f091272
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
includes/ImageFunctions.php
View file

@ -5,7 +5,7 @@
*
* @param $length String: CSS/SVG length.
* @param $viewpoerSize: Float optional scale for percentage units...
* @return Integer: length in pixels
* @return float: length in pixels
*/
function wfScaleSVGUnit( $length, $viewportSize=512 ) {
static $unitLength = array(
@ -24,13 +24,13 @@ function wfScaleSVGUnit( $length, $viewportSize=512 ) {
$length = floatval( $matches[1] );
$unit = $matches[2];
if( $unit == '%' ) {
return round( $length * 0.01 * $viewportSize );
return $length * 0.01 * $viewportSize;
} else {
return round( $length * $unitLength[$unit] );
return $length * $unitLength[$unit];
}
} else {
// Assume pixels
return round( floatval( $length ) );
return floatval( $length );
}
}
@ -76,8 +76,11 @@ class XmlSizeFilter {
$width = $height * $aspect;
}
$this->width = $width;
$this->height = $height;
if( $width > 0 && $height > 0 ) {
$this->width = intval( round( $width ) );
$this->height = intval( round( $height ) );
}
$this->first = false;
}
}