Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix detect.py --view-img for non-ASCII paths #7093

Merged
merged 15 commits into from
Mar 25, 2022
Merged

Fix detect.py --view-img for non-ASCII paths #7093

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ec96eff
Update detect.py
Zengyf-CVer Mar 21, 2022
e375cd9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 21, 2022
d270239
Merge branch 'master' into patch-4
glenn-jocher Mar 25, 2022
b497878
Update general.py
glenn-jocher Mar 25, 2022
fef17db
Update detect.py
glenn-jocher Mar 25, 2022
1470175
Update general.py
glenn-jocher Mar 25, 2022
3a8ff00
Update general.py
glenn-jocher Mar 25, 2022
7858188
Update general.py
glenn-jocher Mar 25, 2022
0b9156a
Update general.py
glenn-jocher Mar 25, 2022
e30d9f3
Update general.py
glenn-jocher Mar 25, 2022
3b228d9
Update general.py
glenn-jocher Mar 25, 2022
38673d4
Merge branch 'master' into patch-4
glenn-jocher Mar 25, 2022
17a0523
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 25, 2022
a1b64ef
Update general.py
glenn-jocher Mar 25, 2022
cb1c40d
Update general.py
glenn-jocher Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion utils/general.py
View file
Open in desktop
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