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

…#235-basjan
PHPOffice · May 11, 2014 · fc66030 · fc66030
2 parents 17e2f02 + 539a173
commit fc66030
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/PhpWord/Shared/Drawing.php b/src/PhpWord/Shared/Drawing.php
@@ -56,7 +56,7 @@ public static function emuToPixels($value = 0)
      */
     public static function pixelsToPoints($value = 0)
     {
-        return $value * 0.67777777;
+        return $value * 0.75;
     }
 
     /**

diff --git a/tests/PhpWord/Tests/Shared/DrawingTest.php b/tests/PhpWord/Tests/Shared/DrawingTest.php
@@ -44,7 +44,7 @@ public function testUnitConversions()
             $this->assertEquals(round($value / 9525), $result);
 
             $result = Drawing::pixelsToPoints($value);
-            $this->assertEquals($value * 0.67777777, $result);
+            $this->assertEquals($value * 0.75, $result);
 
             $result = Drawing::pointsToPixels($value);
             $this->assertEquals($value * 1.333333333, $result);
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ public static function emuToPixels($value = 0) @@
          */
         public static function pixelsToPoints($value = 0)
         {
-            return $value * 0.67777777;
+            return $value * 0.75;
         }
         /**
@@ Expand Down @@