From 60628c77b356d0617932887453c3783307aa682a Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Mon, 7 Jul 2014 14:42:46 +0900
Subject: [PATCH] Fix return value of FreeTypeFont.textsize() does not include
 font offsets

---
 PIL/ImageFont.py                            |   3 ++-
 Tests/images/rectangle_surrounding_text.png | Bin 0 -> 1520 bytes
 Tests/test_imagefont.py                     |  16 +++++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Tests/images/rectangle_surrounding_text.png

diff --git a/PIL/ImageFont.py b/PIL/ImageFont.py
index 18d09b871..34fe510bd 100644
--- a/PIL/ImageFont.py
+++ b/PIL/ImageFont.py
@@ -140,7 +140,8 @@ class FreeTypeFont:
         return self.font.ascent, self.font.descent
 
     def getsize(self, text):
-        return self.font.getsize(text)[0]
+        size, offset = self.font.getsize(text)
+        return (size[0] + offset[0], size[1] + offset[1])
 
     def getoffset(self, text):
         return self.font.getsize(text)[1]
diff --git a/Tests/images/rectangle_surrounding_text.png b/Tests/images/rectangle_surrounding_text.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b75a5e9c7ae1fc828125e2903ea6136d52cd2eb
GIT binary patch
literal 1520
zcmcJP`#;lr9LFUc^q`wdij?CJ=9ZS_vYaU6tPRtWVJ^AldZr!ruxWKdE)Pjf?&QvN
zNG{8aC6YoKF>^g5cQYojG0wO1!}$-+^M}vp{nPvPcs$?l$2-vx36no~@}Pu-guK1o
z6_kX;K7F9}m5~JAx?9;95)ub!_E#=nC*<-*J?)&sRo<*cnFZk8AH+jkW%~Cbo*j=o
zY6p(}yl73=wbn~4QEk>q35!Hucl04A*eVmysz`d4{gEP;qDZ=5uddV(Lf46i7WDOQ
zH>;%7nnjtq&<iH}(l50V^Ebyi(`Iwy+EPIBf4t0{pWUmY2qt^>XB7=-nU!^!fW0HR
z1ixaXWavJxCbw8^IVnlhN8w&T@QJ4>C=VB7m22SF48~Z9X+T)eP3qg4dt9!!uHTs>
z2_5Z5Wn3=zfIoIC^BdUI^rO|IQx?jH)XgG(ImRFf1)h2aD0i2lHYyd{6yc|lm3Hc9
z=?lB_hN}dlFolB}V_{J^9F7DuW)jw>_=8F(g5Emn;1~K!<9s`h)spzK%$V)QuyOhp
z!O4l$)z!r;aG+WjI_fB5mR-;6H{rxKG&IzBGV`;uMZ)y}80_IYpATMwK=Ztnt+i?O
zR2UjyTO>l}TV^c|F(&z`U~c=v!~F5)<GW226@hp>xD;b!W0Ph9t>c8yM#*B)%({?T
zRpp$G!eaA#{nv#gXJ_Z|2}WgQWmdrI*49PDYyCi`T4-3<%F0T0MTPOnl(@LKa%7%J
zw6T;AB|h;VLP0S|<fDOwWgf2q^H)-lPLfXphDaoyIs`)^kpe9-ZmJ`(v(r{1_Jgk=
zx&>R~;-sk2!Kn*aT3Q;Y&??mjfmGGhLIMMgv#$C1`5_R95q2qisQ^lx#hcSYNBxae
z040mRUqlvM%9~FV5G-M->Vr>Ca17|O(^unp<IS}4^0N>KL{zJ#r4>He>QU>n@-%b=
zG5qDr7Y?VAy;S@lx@C7^pnR^cz#;p5(W_U2+1?!M1i%cfzJ9Ff&fJ^(`>hjZXJ@HY
zDmchqSNf-)BA18LCg`8?EZ8j8Q3cY@7Ov<l;0a{OEy+q72j|Q3BAW+;Qpj5mqz^~(
zC!l11gTZ2XdHHk-rQ<yu4!4RCQNRHm&kWq$4Kt2R?TWXzH~ChC)xUY8w74TY9`J=b
z6hEW9dj9-Z_<|XG1DI2uMO3F$6mKMbJ~6^PPf1A$W1`u7JH(nc3Z1J&{pRZCX7O)K
zZ%>bkT>KURi=FuP4d0)8R45dR#bWD(wzjr(kjw1c9Fx3<m04RH1QoL~Z4G$x#&ca9
z4kr^Xs}bAgWk+c&Ec6zOHg5OrgTwqy{Uz_eX^q*&-?<$e+-;Ybz+$m_b0F{ELqbP@
z4KIWCef?U(3ar1WUtmSf2guFc*%cFUIG}&kS#50-H+b@CtGkNI%AHc|YLA>i5*(g9
z$?scMd#PhG5E~jAYMNuPTe1eZbZu;8B$_wUkQtLUHa51zuAwzHmQjKtBfozxv<ahG
z>;${GxF8TIR4Tdn1`2R=+|WHi7Rw-<t3yAIspmf$32DqQ^1OjYD=8`h22xZZLu@va
zxM>(czOdKckjh%xFw6ikZZ!oB>Rolx1A(CGsogV4oXhsqy1Mo545KvKa(h&?L%yYb
z&5)!KjQzrOdL#NYH2OLQL)A%o=YzYb7R8@HP#T+?i6jz(!LV#GI};pxcyV|*lVYMG
zXFJ911KW}xBV?RBJj6S~^~6M3G#Xf!YHSPLyFETL_Ab+Ew(Oh;VU}_WZ|(u$={d=t
zWTMeLKEI}_3O@ZJm^Ny4cSj}9R7Gxr{s(9fqp7KRPT{+dv^Mjky4%-e{57tfzuDK*
zLui>eAMj}&Z>~F&o6!n|LV-KrKbfrEV@oPn-HYcd{J5|GBlk*ItTyw)`%x9)**{|J
MuOhEhTYLTa52+5~l>h($

literal 0
HcmV?d00001

diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
index 927c80bee..2fa679404 100644
--- a/Tests/test_imagefont.py
+++ b/Tests/test_imagefont.py
@@ -71,11 +71,25 @@ try:
             self.assert_image_equal(img_path, img_filelike)
             self._clean()
 
+        def test_textsize_equal(self):
+            im = Image.new(mode='RGB', size=(300, 100))
+            draw = ImageDraw.Draw(im)
+            ttf = ImageFont.truetype(font_path, font_size)
+
+            txt = "Hello World!"
+            size = draw.textsize(txt, ttf)
+            draw.text((10, 10), txt, font=ttf)
+            draw.rectangle((10, 10, 10 + size[0], 10 + size[1]))
+
+            target = 'Tests/images/rectangle_surrounding_text.png'
+            target_img = Image.open(target)
+            self.assert_image_equal(im, target_img)
+
         def test_render_multiline(self):
             im = Image.new(mode='RGB', size=(300, 100))
             draw = ImageDraw.Draw(im)
             ttf = ImageFont.truetype(font_path, font_size)
-            line_spacing = draw.textsize('A', font=ttf)[1] + 8
+            line_spacing = draw.textsize('A', font=ttf)[1] + 4
             lines = ['hey you', 'you are awesome', 'this looks awkward']
             y = 0
             for line in lines: