未验证 提交 71d13217 编写于 作者: S shiyutang 提交者: GitHub

[BugFix] Errors in Update pillow (#8460)

* fix_textbbox

* compact_py37

* update_req

* fix_deploy_cannot_find
上级 d70598ec
...@@ -17,12 +17,22 @@ from __future__ import division ...@@ -17,12 +17,22 @@ from __future__ import division
import os import os
import cv2 import cv2
import numpy as np import numpy as np
import PIL
from PIL import Image, ImageDraw, ImageFile from PIL import Image, ImageDraw, ImageFile
ImageFile.LOAD_TRUNCATED_IMAGES = True ImageFile.LOAD_TRUNCATED_IMAGES = True
from collections import deque from collections import deque
from ppdet.utils.compact import imagedraw_textsize_c 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): def visualize_box_mask(im, results, labels, threshold=0.5):
""" """
......
...@@ -16,11 +16,20 @@ from __future__ import division ...@@ -16,11 +16,20 @@ from __future__ import division
import os import os
import cv2 import cv2
import math
import numpy as np import numpy as np
import PIL
from PIL import Image, ImageDraw, ImageFile from PIL import Image, ImageDraw, ImageFile
ImageFile.LOAD_TRUNCATED_IMAGES = True 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): def visualize_box_mask(im, results, labels, threshold=0.5):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册