Merge branch '#233-basjan' into develop

Author: ivanlanin

src/PhpWord/Shared/Drawing.php

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

tests/PhpWord/Tests/Shared/DrawingTest.php

@@ -56,10 +56,10 @@ public function testUnitConversions()
             $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);
         }
     }