From 3a822a22ceedaca367f7a790c7d1091c0b426758 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 17 Sep 2021 13:02:37 +0200 Subject: [PATCH] `PIL.ImageDraw.text(anchor=...)` removal, reduce to `>=7.1.2` (#4842) * Unpin Pillow * Update requirements.txt * Update plots.py --- requirements.txt | 2 +- utils/plots.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index b84b353..42d5dfc 100755 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ matplotlib>=3.2.2 numpy>=1.18.5 opencv-python>=4.1.2 -Pillow>=8.0.0 +Pillow>=7.1.2 PyYAML>=5.3.1 scipy>=1.4.1 torch>=1.7.0 diff --git a/utils/plots.py b/utils/plots.py index 9570fdf..5ff72cb 100644 --- a/utils/plots.py +++ b/utils/plots.py @@ -3,11 +3,11 @@ Plotting utils """ -import math from copy import copy from pathlib import Path import cv2 +import math import matplotlib import matplotlib.pyplot as plt import numpy as np @@ -80,9 +80,10 @@ class Annotator: if self.pil or not is_ascii(label): self.draw.rectangle(box, width=self.lw, outline=color) # box if label: - w = self.font.getsize(label)[0] # text width + w, h = self.font.getsize(label) # text width self.draw.rectangle([box[0], box[1] - self.fh, box[0] + w + 1, box[1] + 1], fill=color) - self.draw.text((box[0], box[1]), label, fill=txt_color, font=self.font, anchor='ls') + # self.draw.text((box[0], box[1]), label, fill=txt_color, font=self.font, anchor='ls') # for PIL>8.0 + self.draw.text((box[0], box[1] - h), label, fill=txt_color, font=self.font) else: # cv2 c1, c2 = (int(box[0]), int(box[1])), (int(box[2]), int(box[3])) cv2.rectangle(self.im, c1, c2, color, thickness=self.lw, lineType=cv2.LINE_AA)