From 029f83af845d6f36090c445399c272dd34d45aaa Mon Sep 17 00:00:00 2001 From: SecretStar112 Date: Fri, 25 Mar 2022 20:40:55 +0800 Subject: [PATCH] Fix `detect.py --view-img` for non-ASCII paths (#7093) * 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 --- utils/general.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utils/general.py b/utils/general.py index dcdb58c..45e23ed 100755 --- a/utils/general.py +++ b/utils/general.py @@ -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) @@ -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