Skip to content

Commit

Permalink
Fix detect.py --view-img for non-ASCII paths (#7093)
Browse files Browse the repository at this point in the history
* Update detect.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

* Update detect.py

* Update general.py

* Update general.py

* Update general.py

* Update general.py

* Update general.py

* Update general.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update general.py

* Update general.py

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>
  • Loading branch information
3 people committed Mar 25, 2022
1 parent 7061625 commit 029f83a
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion utils/general.py
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,9 @@ def increment_path(path, exist_ok=False, sep='', mkdir=False):


# OpenCV Chinese-friendly functions ------------------------------------------------------------------------------------
imshow_ = cv2.imshow # copy to avoid recursion errors


def imread(path):
return cv2.imdecode(np.fromfile(path, np.uint8), cv2.IMREAD_COLOR)

Expand All @@ -917,7 +920,11 @@ def imwrite(path, im):
return False


cv2.imread, cv2.imwrite = imread, imwrite # redefine
def imshow(path, im):
imshow_(path.encode('unicode_escape').decode(), im)


cv2.imread, cv2.imwrite, cv2.imshow = imread, imwrite, imshow # redefine

# Variables ------------------------------------------------------------------------------------------------------------
NCOLS = 0 if is_docker() else shutil.get_terminal_size().columns # terminal window size for tqdm

0 comments on commit 029f83a

Please sign in to comment.