Skip to content

P
PaddleClas

PaddlePaddle / PaddleClas
大约 2 年 前同步成功

通知 118
Star 4999
Fork 1114
P
PaddleClas
提交 de859b4a 编写于 作者: G gaotingquan 提交者： Tingquan Gao
浏览文件
操作

fix: compatible with opencv under version 4.4.0

上级 de65a13e
隐藏空白更改
内联 并排
Showing with 6 addition and 0 deletion
deploy/python/preprocess.py
浏览文件 @ de859b4a
...@@ -78,6 +78,9 @@ class UnifiedResize(object): ...@@ -78,6 +78,9 @@ class UnifiedResize(object):
if backend.lower() == "cv2": if backend.lower() == "cv2":
if isinstance(interpolation, str): if isinstance(interpolation, str):
interpolation = _cv2_interp_from_str[interpolation.lower()] interpolation = _cv2_interp_from_str[interpolation.lower()]
# compatible with opencv < version 4.4.0
elif not interpolation:
interpolation = cv2.INTER_LINEAR
self.resize_func = partial(cv2.resize, interpolation=interpolation) self.resize_func = partial(cv2.resize, interpolation=interpolation)
elif backend.lower() == "pil": elif backend.lower() == "pil":
if isinstance(interpolation, str): if isinstance(interpolation, str):
......
ppcls/data/preprocess/ops/operators.py
浏览文件 @ de859b4a
...@@ -59,6 +59,9 @@ class UnifiedResize(object): ...@@ -59,6 +59,9 @@ class UnifiedResize(object):
if backend.lower() == "cv2": if backend.lower() == "cv2":
if isinstance(interpolation, str): if isinstance(interpolation, str):
interpolation = _cv2_interp_from_str[interpolation.lower()] interpolation = _cv2_interp_from_str[interpolation.lower()]
# compatible with opencv < version 4.4.0
elif not interpolation:
interpolation = cv2.INTER_LINEAR
self.resize_func = partial(cv2.resize, interpolation=interpolation) self.resize_func = partial(cv2.resize, interpolation=interpolation)
elif backend.lower() == "pil": elif backend.lower() == "pil":
if isinstance(interpolation, str): if isinstance(interpolation, str):
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或