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

Merge branch 'Fixed-conversion' of github.com:basjan/PHPWord into #234-#235-basjan

This commit is contained in:
Ivan Lanin 2014-05-11 17:57:01 +07:00
parent 17e2f02817 539a173dc2
commit fc66030b82
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ class Drawing
*/ */
public static function pixelsToPoints($value = 0) public static function pixelsToPoints($value = 0)
{ {
return $value * 0.67777777; return $value * 0.75;
} }
/** /**

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

@ -44,7 +44,7 @@ class DrawingTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(round($value / 9525), $result); $this->assertEquals(round($value / 9525), $result);
$result = Drawing::pixelsToPoints($value); $result = Drawing::pixelsToPoints($value);
$this->assertEquals($value * 0.67777777, $result); $this->assertEquals($value * 0.75, $result);
$result = Drawing::pointsToPixels($value); $result = Drawing::pointsToPixels($value);
$this->assertEquals($value * 1.333333333, $result); $this->assertEquals($value * 1.333333333, $result);