Merge pull request #606 from voxel51/pillow-fix

Release v0.12.2
voxel51 · Jan 2, 2024 · 05bb72f · 05bb72f
2 parents 1d703d9 + 399af95
commit 05bb72f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/eta/core/annotations.py b/eta/core/annotations.py
@@ -1663,7 +1663,7 @@ def _draw_bounding_box(
 
     # Title background
     if title_str:
-        textw, texth = font.getsize(title_str)
+        textw, texth = _get_text_size(font, title_str)
         bgtlx = boxtlx - linewidth + 1
         bgbry = boxtly - linewidth + 1
         bgbrx = bgtlx + textw + 2 * (label_text_pad_pixels + _DX)
@@ -1912,8 +1912,17 @@ def _parse_hex_color(h):
     return rgb
 
 
+def _get_text_size(font, text_str):
+    try:
+        _, _, w, h = font.getbbox(text_str)
+    except AttributeError:
+        w, h = font.getsize(text_str)  # Pillow<8
+
+    return w, h
+
+
 def _compute_max_text_size(font, text_strs):
-    sizes = [font.getsize(s) for s in text_strs]
+    sizes = [_get_text_size(font, s) for s in text_strs]
     width, height = np.max(sizes, axis=0)
     return width, height
 

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 from wheel.bdist_wheel import bdist_wheel
 
 
-VERSION = "0.12.1"
+VERSION = "0.12.2"
 
 
 class BdistWheelCustom(bdist_wheel):