LDOUBLEV 315c07d560 fix conflicts

2020-12-21 13:43:40 +00:00

..

clipper.cpp

…

config.cpp

update cpp_infer to 2.0

2020-12-21 13:41:33 +00:00

main.cpp

update cpp_infer to 2.0

2020-12-21 13:41:33 +00:00

ocr_cls.cpp

update cpp_infer to 2.0

2020-12-21 13:41:33 +00:00

ocr_det.cpp

update cpp_infer to 2.0

2020-12-21 13:41:33 +00:00

ocr_rec.cpp

update cpp_infer to 2.0

2020-12-21 13:41:33 +00:00

postprocess_op.cpp

…

preprocess_op.cpp

fix db process

2020-12-18 14:45:06 +08:00

utility.cpp

…