Skip to content

Commit

Permalink
PIL.ImageDraw.text(anchor=...) removal, reduce to >=7.1.2 (ultral…
Browse files Browse the repository at this point in the history
…ytics#4842)

* Unpin Pillow

* Update requirements.txt

* Update plots.py
  • Loading branch information
glenn-jocher committed Sep 17, 2021
1 parent 4005b25 commit b3b8f7e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions utils/plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -80,9 +80,10 @@ def box_label(self, box, label='', color=(128, 128, 128), txt_color=(255, 255, 2
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)
Expand Down

0 comments on commit b3b8f7e

Please sign in to comment.