Modify the resize operation to be consistent with the python version (#2651)
This commit is contained in:
parent
796aea86eb
commit
64a3580f1b
|
@ -77,19 +77,10 @@ void ResizeImgType0::Run(const cv::Mat &img, cv::Mat &resize_img,
|
||||||
|
|
||||||
int resize_h = int(float(h) * ratio);
|
int resize_h = int(float(h) * ratio);
|
||||||
int resize_w = int(float(w) * ratio);
|
int resize_w = int(float(w) * ratio);
|
||||||
if (resize_h % 32 == 0)
|
|
||||||
resize_h = resize_h;
|
|
||||||
else if (resize_h / 32 < 1 + 1e-5)
|
|
||||||
resize_h = 32;
|
|
||||||
else
|
|
||||||
resize_h = (resize_h / 32) * 32;
|
|
||||||
|
|
||||||
if (resize_w % 32 == 0)
|
resize_h = max(int(round(float(resize_h) / 32) * 32), 32);
|
||||||
resize_w = resize_w;
|
resize_w = max(int(round(float(resize_w) / 32) * 32), 32);
|
||||||
else if (resize_w / 32 < 1 + 1e-5)
|
|
||||||
resize_w = 32;
|
|
||||||
else
|
|
||||||
resize_w = (resize_w / 32) * 32;
|
|
||||||
if (!use_tensorrt) {
|
if (!use_tensorrt) {
|
||||||
cv::resize(img, resize_img, cv::Size(resize_w, resize_h));
|
cv::resize(img, resize_img, cv::Size(resize_w, resize_h));
|
||||||
ratio_h = float(resize_h) / float(h);
|
ratio_h = float(resize_h) / float(h);
|
||||||
|
|
|
@ -39,7 +39,10 @@ class TextDetector(object):
|
||||||
self.args = args
|
self.args = args
|
||||||
self.det_algorithm = args.det_algorithm
|
self.det_algorithm = args.det_algorithm
|
||||||
pre_process_list = [{
|
pre_process_list = [{
|
||||||
'DetResizeForTest': None
|
'DetResizeForTest': {
|
||||||
|
'limit_side_len': args.det_limit_side_len,
|
||||||
|
'limit_type': args.det_limit_type
|
||||||
|
}
|
||||||
}, {
|
}, {
|
||||||
'NormalizeImage': {
|
'NormalizeImage': {
|
||||||
'std': [0.229, 0.224, 0.225],
|
'std': [0.229, 0.224, 0.225],
|
||||||
|
|
Loading…
Reference in New Issue