Skip to content

πŸ“„ Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.

chore(rapidocr): optimize vis class

SWHL552b3c9271ec
diff --git a/python/demo.py b/python/demo.py
index 295c740..cc8808c 100644
--- a/python/demo.py
+++ b/python/demo.py
@@ -9,4 +9,4 @@ img_url = "https://img1.baidu.com/it/u=3619974146,1266987475&fm=253&fmt=auto&app
result = engine(img_url)
print(result)
-result.vis()
+result.vis("vis_result.jpg")
diff --git a/python/rapidocr/ch_ppocr_cls/utils.py b/python/rapidocr/ch_ppocr_cls/utils.py
index f14e8a2..7b9c229 100644
--- a/python/rapidocr/ch_ppocr_cls/utils.py
+++ b/python/rapidocr/ch_ppocr_cls/utils.py
@@ -46,11 +46,9 @@ class TextClsOutput:
vis = VisRes()
vis_img = vis.draw_rec_res(self.img_list, txts, scores)
- if save_path is None:
- save_path = "vis_cls.jpg"
-
- save_img(save_path, vis_img)
- logger.info("Visualization saved as %s", save_path)
+ if save_path is not None:
+ save_img(save_path, vis_img)
+ logger.info("Visualization saved as %s", save_path)
return vis_img
diff --git a/python/rapidocr/ch_ppocr_det/utils.py b/python/rapidocr/ch_ppocr_det/utils.py
index ace8bcc..4690b06 100644
--- a/python/rapidocr/ch_ppocr_det/utils.py
+++ b/python/rapidocr/ch_ppocr_det/utils.py
@@ -36,11 +36,9 @@ class TextDetOutput:
vis = VisRes()
vis_img = vis.draw_dt_boxes(self.img, self.boxes, self.scores)
- if save_path is None:
- save_path = "vis_det.jpg"
-
- save_img(save_path, vis_img)
- logger.info("Visualization saved as %s", save_path)
+ if save_path is not None:
+ save_img(save_path, vis_img)
+ logger.info("Visualization saved as %s", save_path)
return vis_img
diff --git a/python/rapidocr/ch_ppocr_rec/utils.py b/python/rapidocr/ch_ppocr_rec/utils.py
index a67ed51..4b4ec15 100644
--- a/python/rapidocr/ch_ppocr_rec/utils.py
+++ b/python/rapidocr/ch_ppocr_rec/utils.py
@@ -59,11 +59,9 @@ class TextRecOutput:
self.imgs, self.txts, self.scores, lang_rec=self.lang_rec
)
- if save_path is None:
- save_path = "vis_rec.jpg"
-
- save_img(save_path, vis_img)
- logger.info("Visualization saved as %s", save_path)
+ if save_path is not None:
+ save_img(save_path, vis_img)
+ logger.info("Visualization saved as %s", save_path)
return vis_img
diff --git a/python/rapidocr/utils/typings.py b/python/rapidocr/utils/typings.py
index 1332e40..51637cf 100644
--- a/python/rapidocr/utils/typings.py
+++ b/python/rapidocr/utils/typings.py
@@ -68,12 +68,11 @@ class RapidOCROutput:
font_path=font_path,
lang_rec=self.lang_rec,
)
- if save_path is None:
- save_path = "vis_det_cls_rec.png"
- save_img(save_path, vis_img)
- logger.info("Visualization saved as %s", save_path)
- return
+ if save_path is not None:
+ save_img(save_path, vis_img)
+ logger.info("Visualization saved as %s", save_path)
+ return vis_img
# single word vis
words_results = self.word_results
@@ -89,5 +88,7 @@ class RapidOCROutput:
if save_path is None:
save_path = "vis_return_words.png"
- save_img(save_path, vis_img)
- logger.info("Single word visualization saved as %s", save_path)
+ if save_path is not None:
+ save_img(save_path, vis_img)
+ logger.info("Single word visualization saved as %s", save_path)
+ return vis_img