Merge pull request #5470 from radarhere/wmf_dpi_rounding

Removed WMF DPI rounding

Tests/test_file_wmf.py

@@ -44,14 +44,9 @@ def save(self, im, fp, filename):
     WmfImagePlugin.register_handler(original_handler)
 
 
-def test_load_dpi_rounding():
-    # Round up
+def test_load_float_dpi():
     with Image.open("Tests/images/drawing.emf") as im:
-        assert im.info["dpi"] == 1424
-
-    # Round down
-    with Image.open("Tests/images/drawing_roundDown.emf") as im:
-        assert im.info["dpi"] == 1426
+        assert im.info["dpi"] == 1423.7668161434979
 
 
 def test_load_set_dpi():

src/PIL/WmfImagePlugin.py

@@ -127,8 +127,8 @@ def _open(self):
             size = x1 - x0, y1 - y0
 
             # calculate dots per inch from bbox and frame
-            xdpi = int(2540.0 * (x1 - y0) / (frame[2] - frame[0]) + 0.5)
-            ydpi = int(2540.0 * (y1 - y0) / (frame[3] - frame[1]) + 0.5)
+            xdpi = 2540.0 * (x1 - y0) / (frame[2] - frame[0])
+            ydpi = 2540.0 * (y1 - y0) / (frame[3] - frame[1])
 
             self.info["wmf_bbox"] = x0, y0, x1, y1
 
@@ -152,7 +152,7 @@ def _load(self):
 
     def load(self, dpi=None):
         if dpi is not None and self._inch is not None:
-            self.info["dpi"] = int(dpi + 0.5)
+            self.info["dpi"] = dpi
             x0, y0, x1, y1 = self.info["wmf_bbox"]
             self._size = (
                 (x1 - x0) * self.info["dpi"] // self._inch,