From 61d07849335715b978235ad452e89b56f30ad757 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 28 Dec 2019 11:25:39 +1100
Subject: [PATCH 1/2] Allow loading of WMF images at a given DPI

---
 Tests/images/drawing_wmf_ref_144.png | Bin 0 -> 1209 bytes
 Tests/test_file_wmf.py               |  11 +++++++++++
 src/PIL/WmfImagePlugin.py            |  22 +++++++++++++++++-----
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 Tests/images/drawing_wmf_ref_144.png

diff --git a/Tests/images/drawing_wmf_ref_144.png b/Tests/images/drawing_wmf_ref_144.png
new file mode 100644
index 0000000000000000000000000000000000000000..20ed9ce597b5f648871c3210a4a560987f38ed61
GIT binary patch
literal 1209
zcmeAS@N?(olHy`uVBq!ia0vp^OF)=|2}n-6E+odlz|!F9;uumf=k1-llO8DuI6Umz
z`u_i^o7~Hie0V-xc5t3wygM}e$!s>+$2q_EasPaA{{?qI-fgqH{|lBT-Vm!WdUe46
z?7pzgN$w4z^ZlQ+XB;b?&AFTZ!{f#F|1axgTQGi`{PDo+x+e2|GnQ?9e}--SSHAo*
zPu(Q{#G3Q_cIm$HoOwP{ZF^H~qFJGDY3vo<HJ>Zqe4TNArjmT;UbD}Z%1_oS_G`_*
z^!w7KqUxr*bx+GP52VD;*jrlmZqJXs>bG}p;gS7VH<|bI(tpbLGB-`!cfJ0|Y=5&e
z_OHzz<*G}+oU*I8!uiePUDNB+L+@91-m2Vw$j&=BY3<(G3CgiC!TGg0OSH3}ukGpG
z;?=vybmPRZHLcsF%r3oJS^YXe`L0H6K5NdB*~?zUcK4RFZ`reY!^C&fy2>rhF3ny2
zUGIonmB-Y3sy96N*QA|2y}fXWyJ*<HgdLkV9!^%sT^RG;=1t)D1DBR=I=nkYI(?09
z$bt!tXW8=B-Z^Y7I-B=SQKwbqZHwgGwK@}3a?A=&FU@~;c;5~8zrTCWM%>mf+)<zK
zc~{QTN!tpK-Kx_(EPFVOdH%)@bNvg~UOtboOESJ@EO!6Q%pCW|w=3S?c=PbH*v*qb
zUhToOHR<m&cL15O8zo<x{<6B`vu*K#vMcOn)jw_--aK7qzwKa|$c?_L<l=<&*HhKg
zH_5Vs708>he_J)TKUeK`V1hMQj{Dvg=IXC~$+J&_R5L*Z8{cYdfT#xwKGJWm&P?7E
z3)T-Z^6hWE<F8GkwmdkU0x|(bG0cR$E-m+Gtc#s+_xoI!$@Mp6Zm%wrxp63EH(1vS
zbF<^$s^;?NBtp#wI{x@KuUI~)z`7f6o@AHYKiqn<?5cQ9TlKeneOnD~u4Ag+I`3H2
zybU)`PVYHcc179jux;{0+n5<S;YT+}zT4T=zg5N0?A|wT!(WZEKMfU|kM6DWH=Dil
zZ(ZI4#kd8QTAZ^VZi{&o;r%Y<F(^(#a^hA->IJGNZ@PJA?bLmZ?Ot&U9_B7&YPHER
zD^`}h6sdG`^4YY!<#%ps*U#_$zM`oA)ncJHj}t$<i$6O{9B7lXmi4OsQ`-yoSchxs
zPTenke0TKMOF{n~Iqt~@O%$8zzxPAltZ7>^YL9f5FBVzq`tftlo~xIqirt+p{vpgK
zHtNdzkb}`n#V%cXv`uA?cD9Oc?>ooCyLXgby7aEic@KA%magx6J=<z$x%_N>-L?6u
zcJb!-{O5)*d-+x|dj4$xZEyef?6~=Kg>><X%hOpTK330Ny7YF+e))bu`GYdA{(hBr
ztC_Op%ltRrnSV=vY&^3tG5*c&o*%b@_eoBe);Rg^zNWX#RU0+;{}Jeqef#mo!mlTM
z4cpfwwCg=FTKMa)&8E$Vwry~pJSjSjFY<`pET_BsK2FShb75|b+iLs0<p%p^2q(zb
zhVqwI@J%#t-@N9b&kc9M(!kbuh97sP+?f98TNkjz&`y{i+#a7<`;Yla(&aY~8;u-+
PMG}LjtDnm{r-UW|OmT7T

literal 0
HcmV?d00001

diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py
index 01a802bfb84..0aa36c33cce 100644
--- a/Tests/test_file_wmf.py
+++ b/Tests/test_file_wmf.py
@@ -53,6 +53,17 @@ def test_load_dpi_rounding(self):
         with Image.open("Tests/images/drawing_roundDown.emf") as im:
             self.assertEqual(im.info["dpi"], 1426)
 
+    def test_load_set_dpi(self):
+        with Image.open("Tests/images/drawing.wmf") as im:
+            self.assertEquals(im.size, (82, 82))
+
+            if hasattr(Image.core, "drawwmf"):
+                im.load(144)
+                self.assertEquals(im.size, (164, 164))
+
+                with Image.open("Tests/images/drawing_wmf_ref_144.png") as expected:
+                    self.assert_image_similar(im, expected, 2.0)
+
     def test_save(self):
         im = hopper()
 
diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py
index 7695a68e74d..024222c9b79 100644
--- a/src/PIL/WmfImagePlugin.py
+++ b/src/PIL/WmfImagePlugin.py
@@ -78,6 +78,7 @@ class WmfStubImageFile(ImageFile.StubImageFile):
     format_description = "Windows Metafile"
 
     def _open(self):
+        self._inch = None
 
         # check placable header
         s = self.fp.read(80)
@@ -87,7 +88,7 @@ def _open(self):
             # placeable windows metafile
 
             # get units per inch
-            inch = word(s, 14)
+            self._inch = word(s, 14)
 
             # get bounding box
             x0 = short(s, 6)
@@ -96,12 +97,14 @@ def _open(self):
             y1 = short(s, 12)
 
             # normalize size to 72 dots per inch
-            size = (x1 - x0) * 72 // inch, (y1 - y0) * 72 // inch
+            self.info["dpi"] = 72
+            size = (
+                (x1 - x0) * self.info["dpi"] // self._inch,
+                (y1 - y0) * self.info["dpi"] // self._inch,
+            )
 
             self.info["wmf_bbox"] = x0, y0, x1, y1
 
-            self.info["dpi"] = 72
-
             # sanity check (standard metafile header)
             if s[22:26] != b"\x01\x00\t\x00":
                 raise SyntaxError("Unsupported WMF file format")
@@ -118,7 +121,6 @@ def _open(self):
             # get frame (in 0.01 millimeter units)
             frame = _long(s, 24), _long(s, 28), _long(s, 32), _long(s, 36)
 
-            # normalize size to 72 dots per inch
             size = x1 - x0, y1 - y0
 
             # calculate dots per inch from bbox and frame
@@ -145,6 +147,16 @@ def _open(self):
     def _load(self):
         return _handler
 
+    def load(self, dpi=None):
+        if dpi is not None and self._inch is not None:
+            self.info["dpi"] = int(dpi + 0.5)
+            x0, y0, x1, y1 = self.info["wmf_bbox"]
+            self._size = (
+                (x1 - x0) * self.info["dpi"] // self._inch,
+                (y1 - y0) * self.info["dpi"] // self._inch,
+            )
+        super().load()
+
 
 def _save(im, fp, filename):
     if _handler is None or not hasattr(_handler, "save"):

From feec1bbcb22045dbdcd90074f568d7f114079ae2 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 30 Dec 2019 10:12:37 +1100
Subject: [PATCH 2/2] Updated WMF documentation [ci skip]

---
 docs/handbook/image-file-formats.rst | 69 +++++++++++++++-------------
 docs/releasenotes/7.0.0.rst          | 12 +++++
 2 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/docs/handbook/image-file-formats.rst b/docs/handbook/image-file-formats.rst
index 088fd5a0396..0e068c1e4eb 100644
--- a/docs/handbook/image-file-formats.rst
+++ b/docs/handbook/image-file-formats.rst
@@ -1019,6 +1019,43 @@ this format.
 By default, a Quake2 standard palette is attached to the texture. To override
 the palette, use the putpalette method.
 
+WMF
+^^^
+
+Pillow can identify WMF files.
+
+On Windows, it can read WMF files. By default, it will load the image at 72
+dpi. To load it at another resolution:
+
+.. code-block:: python
+
+    from PIL import Image
+    with Image.open("drawing.wmf") as im:
+        im.load(dpi=144)
+
+To add other read or write support, use
+:py:func:`PIL.WmfImagePlugin.register_handler` to register a WMF handler.
+
+.. code-block:: python
+
+    from PIL import Image
+    from PIL import WmfImagePlugin
+
+    class WmfHandler:
+        def open(self, im):
+            ...
+        def load(self, im):
+            ...
+            return image
+        def save(self, im, fp, filename):
+            ...
+
+    wmf_handler = WmfHandler()
+
+    WmfImagePlugin.register_handler(wmf_handler)
+
+    im = Image.open("sample.wmf")
+
 XPM
 ^^^
 
@@ -1176,35 +1213,3 @@ MPEG
 ^^^^
 
 Pillow identifies MPEG files.
-
-WMF
-^^^
-
-Pillow can identify playable WMF files.
-
-In PIL 1.1.4 and earlier, the WMF driver provides some limited rendering
-support, but not enough to be useful for any real application.
-
-In PIL 1.1.5 and later, the WMF driver is a stub driver. To add WMF read or
-write support to your application, use
-:py:func:`PIL.WmfImagePlugin.register_handler` to register a WMF handler.
-
-::
-
-    from PIL import Image
-    from PIL import WmfImagePlugin
-
-    class WmfHandler:
-        def open(self, im):
-            ...
-        def load(self, im):
-            ...
-            return image
-        def save(self, im, fp, filename):
-            ...
-
-    wmf_handler = WmfHandler()
-
-    WmfImagePlugin.register_handler(wmf_handler)
-
-    im = Image.open("sample.wmf")
diff --git a/docs/releasenotes/7.0.0.rst b/docs/releasenotes/7.0.0.rst
index cf88dfa6495..9a4b5a42b35 100644
--- a/docs/releasenotes/7.0.0.rst
+++ b/docs/releasenotes/7.0.0.rst
@@ -94,6 +94,18 @@ Custom unidentified image error
 Pillow will now throw a custom ``UnidentifiedImageError`` when an image cannot be
 identified. For backwards compatibility, this will inherit from ``IOError``.
 
+Loading WMF images at a given DPI
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+On Windows, Pillow can read WMF files, with a default DPI of 72. An image can
+now also be loaded at another resolution:
+
+.. code-block:: python
+
+    from PIL import Image
+    with Image.open("drawing.wmf") as im:
+        im.load(dpi=144)
+
 Other Changes
 =============