Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '#233-basjan' into develop

This commit is contained in:
Ivan Lanin 2014-05-11 10:41:26 +07:00
parent 516c13e032 967c8b273e
commit 9567c6a972
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PhpWord/Shared/Drawing.php
View File

@ -108,7 +108,7 @@ class Drawing
*/
public static function pixelsToCentimeters($value = 0)
{
return $value * 0.028;
return $value * 0.026458333;
}
/**
@ -120,7 +120,7 @@ class Drawing
public static function centimetersToPixels($value = 0)
{
if ($value != 0) {
return $value / 0.028;
return $value / 0.026458333;
} else {
return 0;
}

4
tests/PhpWord/Tests/Shared/DrawingTest.php
View File

@ -56,10 +56,10 @@ class DrawingTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(round($value / 60000), $result);
$result = Drawing::pixelsToCentimeters($value);
$this->assertEquals($value * 0.028, $result);
$this->assertEquals($value * 0.026458333, $result);
$result = Drawing::centimetersToPixels($value);
$this->assertEquals($value / 0.028, $result);
$this->assertEquals($value / 0.026458333, $result);
}
}