ab18c46e by 周伟奇

fix merge bug

1 parent c8e2a8b8
...@@ -1560,7 +1560,7 @@ def se_compare_process(compare_info, ocr_res_dict): ...@@ -1560,7 +1560,7 @@ def se_compare_process(compare_info, ocr_res_dict):
1560 else: 1560 else:
1561 strip_list.append((a, b)) 1561 strip_list.append((a, b))
1562 failure_field = [] 1562 failure_field = []
1563 result_field_list, no_ocr_result, field_img_path_dict = se_compare_license(license_en, ocr_res_dict, field_list) 1563 result_field_list, no_ocr_result, field_img_path_dict = se_compare_license(license_en, ocr_res_dict, strip_list)
1564 for name, value, result, ocr_str, img_path, error_type in result_field_list: 1564 for name, value, result, ocr_str, img_path, error_type in result_field_list:
1565 if license_en not in consts.SKIP_CARD or not no_ocr_result: 1565 if license_en not in consts.SKIP_CARD or not no_ocr_result:
1566 total_fields += 1 1566 total_fields += 1
...@@ -1594,9 +1594,9 @@ def se_compare_process(compare_info, ocr_res_dict): ...@@ -1594,9 +1594,9 @@ def se_compare_process(compare_info, ocr_res_dict):
1594 strip_list.append((a, b)) 1594 strip_list.append((a, b))
1595 failure_field = [] 1595 failure_field = []
1596 if license_en == consts.MVC34_EN: 1596 if license_en == consts.MVC34_EN:
1597 result_field_list, field_img_path_dict = se_mvc34_compare(license_en, ocr_res_dict, field_list) 1597 result_field_list, field_img_path_dict = se_mvc34_compare(license_en, ocr_res_dict, strip_list)
1598 else: 1598 else:
1599 result_field_list, _, field_img_path_dict = se_compare_license(license_en, ocr_res_dict, field_list) 1599 result_field_list, _, field_img_path_dict = se_compare_license(license_en, ocr_res_dict, strip_list)
1600 for name, value, result, ocr_str, img_path, error_type in result_field_list: 1600 for name, value, result, ocr_str, img_path, error_type in result_field_list:
1601 total_fields += 1 1601 total_fields += 1
1602 if result == consts.RESULT_N: 1602 if result == consts.RESULT_N:
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!