[BugFix] Errors in Update pillow (#8460)

* fix_textbbox * compact_py37 * update_req * fix_deploy_cannot_find
PaddlePaddle · Jul 24, 2023 · 71d1321 · 71d1321
1 parent d70598e
commit 71d1321
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/deploy/pptracking/python/mot/visualize.py b/deploy/pptracking/python/mot/visualize.py
@@ -17,12 +17,22 @@
 import os
 import cv2
 import numpy as np
+import PIL
 from PIL import Image, ImageDraw, ImageFile
 ImageFile.LOAD_TRUNCATED_IMAGES = True
 from collections import deque
 from ppdet.utils.compact import imagedraw_textsize_c
 
 
+def imagedraw_textsize_c(draw, text):
+    if int(PIL.__version__.split('.')[0]) < 10:
+        tw, th = draw.textsize(text)
+    else:
+        left, top, right, bottom = draw.textbbox((0, 0), text)
+        tw, th = right - left, bottom - top
+
+    return tw, th
+
 
 def visualize_box_mask(im, results, labels, threshold=0.5):
     """

diff --git a/deploy/python/visualize.py b/deploy/python/visualize.py
@@ -16,12 +16,21 @@
 
 import os
 import cv2
+import math
 import numpy as np
+import PIL
 from PIL import Image, ImageDraw, ImageFile
 ImageFile.LOAD_TRUNCATED_IMAGES = True
-import math
-from ppdet.utils.compact import imagedraw_textsize_c
 
+def imagedraw_textsize_c(draw, text):
+    if int(PIL.__version__.split('.')[0]) < 10:
+        tw, th = draw.textsize(text)
+    else:
+        left, top, right, bottom = draw.textbbox((0, 0), text)
+        tw, th = right - left, bottom - top
+
+    return tw, th
+
 
 def visualize_box_mask(im, results, labels, threshold=0.5):
     """