π Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.
Update LoadImage Class and support Image as input.
SWHL2caa0b083f35
diff --git a/python/rapidocr_onnxruntime/utils.py b/python/rapidocr_onnxruntime/utils.pyindex d56684f..2e6efa8 100644--- a/python/rapidocr_onnxruntime/utils.py+++ b/python/rapidocr_onnxruntime/utils.py@@ -23,7 +23,7 @@ from onnxruntime import (from PIL import Image, ImageDraw, ImageFont, UnidentifiedImageErrorroot_dir = Path(__file__).resolve().parent-InputType = Union[str, np.ndarray, bytes, Path]+InputType = Union[str, np.ndarray, bytes, Path, Image.Image]class OrtInferSession:@@ -122,8 +122,9 @@ class LoadImage:f"The img type {type(img)} does not in {InputType.__args__}")+ origin_img_type = type(img)img = self.load_img(img)- img = self.convert_img(img)+ img = self.convert_img(img, origin_img_type)return imgdef load_img(self, img: InputType) -> np.ndarray:@@ -142,9 +143,12 @@ class LoadImage:if isinstance(img, np.ndarray):return img+ if isinstance(img, Image.Image):+ return np.array(img)+raise LoadImageError(f"{type(img)} is not supported!")- def convert_img(self, img: np.ndarray):+ def convert_img(self, img: np.ndarray, origin_img_type):if img.ndim == 2:return cv2.cvtColor(img, cv2.COLOR_GRAY2BGR)@@ -156,31 +160,20 @@ class LoadImage:if channel == 2:return self.cvt_two_to_three(img)+ if channel == 3:+ if issubclass(origin_img_type, (str, Path, bytes, Image.Image)):+ return cv2.cvtColor(img, cv2.COLOR_RGB2BGR)+ return img+if channel == 4:return self.cvt_four_to_three(img)- if channel == 3:- return cv2.cvtColor(img, cv2.COLOR_RGB2BGR)-raise LoadImageError(f"The channel({channel}) of the img is not in [1, 2, 3, 4]")raise LoadImageError(f"The ndim({img.ndim}) of the img is not in [2, 3]")- @staticmethod- def cvt_four_to_three(img: np.ndarray) -> np.ndarray:- """RGBA β BGR"""- r, g, b, a = cv2.split(img)- new_img = cv2.merge((b, g, r))-- not_a = cv2.bitwise_not(a)- not_a = cv2.cvtColor(not_a, cv2.COLOR_GRAY2BGR)-- new_img = cv2.bitwise_and(new_img, new_img, mask=a)- new_img = cv2.add(new_img, not_a)- return new_img-@staticmethoddef cvt_two_to_three(img: np.ndarray) -> np.ndarray:"""gray + alpha β BGR"""@@ -195,6 +188,19 @@ class LoadImage:new_img = cv2.add(new_img, not_a)return new_img+ @staticmethod+ def cvt_four_to_three(img: np.ndarray) -> np.ndarray:+ """RGBA β BGR"""+ r, g, b, a = cv2.split(img)+ new_img = cv2.merge((b, g, r))++ not_a = cv2.bitwise_not(a)+ not_a = cv2.cvtColor(not_a, cv2.COLOR_GRAY2BGR)++ new_img = cv2.bitwise_and(new_img, new_img, mask=a)+ new_img = cv2.add(new_img, not_a)+ return new_img+@staticmethoddef verify_exist(file_path: Union[str, Path]):if not Path(file_path).exists():diff --git a/python/rapidocr_openvino/utils.py b/python/rapidocr_openvino/utils.pyindex 2dcf149..21d6c3b 100644--- a/python/rapidocr_openvino/utils.py+++ b/python/rapidocr_openvino/utils.py@@ -15,7 +15,7 @@ from openvino.runtime import Corefrom PIL import Image, ImageDraw, ImageFont, UnidentifiedImageErrorroot_dir = Path(__file__).resolve().parent-InputType = Union[str, np.ndarray, bytes, Path]+InputType = Union[str, np.ndarray, bytes, Path, Image.Image]class OpenVINOInferSession:@@ -52,8 +52,9 @@ class LoadImage:f"The img type {type(img)} does not in {InputType.__args__}")+ origin_img_type = type(img)img = self.load_img(img)- img = self.convert_img(img)+ img = self.convert_img(img, origin_img_type)return imgdef load_img(self, img: InputType) -> np.ndarray:@@ -72,9 +73,12 @@ class LoadImage:if isinstance(img, np.ndarray):return img+ if isinstance(img, Image.Image):+ return np.array(img)+raise LoadImageError(f"{type(img)} is not supported!")- def convert_img(self, img: np.ndarray):+ def convert_img(self, img: np.ndarray, origin_img_type):if img.ndim == 2:return cv2.cvtColor(img, cv2.COLOR_GRAY2BGR)@@ -86,31 +90,20 @@ class LoadImage:if channel == 2:return self.cvt_two_to_three(img)+ if channel == 3:+ if issubclass(origin_img_type, (str, Path, bytes, Image.Image)):+ return cv2.cvtColor(img, cv2.COLOR_RGB2BGR)+ return img+if channel == 4:return self.cvt_four_to_three(img)- if channel == 3:- return cv2.cvtColor(img, cv2.COLOR_RGB2BGR)-raise LoadImageError(f"The channel({channel}) of the img is not in [1, 2, 3, 4]")raise LoadImageError(f"The ndim({img.ndim}) of the img is not in [2, 3]")- @staticmethod- def cvt_four_to_three(img: np.ndarray) -> np.ndarray:- """RGBA β BGR"""- r, g, b, a = cv2.split(img)- new_img = cv2.merge((b, g, r))-- not_a = cv2.bitwise_not(a)- not_a = cv2.cvtColor(not_a, cv2.COLOR_GRAY2BGR)-- new_img = cv2.bitwise_and(new_img, new_img, mask=a)- new_img = cv2.add(new_img, not_a)- return new_img-@staticmethoddef cvt_two_to_three(img: np.ndarray) -> np.ndarray:"""gray + alpha β BGR"""@@ -125,6 +118,19 @@ class LoadImage:new_img = cv2.add(new_img, not_a)return new_img+ @staticmethod+ def cvt_four_to_three(img: np.ndarray) -> np.ndarray:+ """RGBA β BGR"""+ r, g, b, a = cv2.split(img)+ new_img = cv2.merge((b, g, r))++ not_a = cv2.bitwise_not(a)+ not_a = cv2.cvtColor(not_a, cv2.COLOR_GRAY2BGR)++ new_img = cv2.bitwise_and(new_img, new_img, mask=a)+ new_img = cv2.add(new_img, not_a)+ return new_img+@staticmethoddef verify_exist(file_path: Union[str, Path]):if not Path(file_path).exists():diff --git a/python/rapidocr_paddle/utils.py b/python/rapidocr_paddle/utils.pyindex eda014c..6169da1 100644--- a/python/rapidocr_paddle/utils.py+++ b/python/rapidocr_paddle/utils.py@@ -19,7 +19,7 @@ from paddle import inferencefrom PIL import Image, ImageDraw, ImageFont, UnidentifiedImageErrorroot_dir = Path(__file__).resolve().parent-InputType = Union[str, np.ndarray, bytes, Path]+InputType = Union[str, np.ndarray, bytes, Path, Image.Image]class PaddleInferSession:@@ -136,8 +136,9 @@ class LoadImage:f"The img type {type(img)} does not in {InputType.__args__}")+ origin_img_type = type(img)img = self.load_img(img)- img = self.convert_img(img)+ img = self.convert_img(img, origin_img_type)return imgdef load_img(self, img: InputType) -> np.ndarray:@@ -156,9 +157,12 @@ class LoadImage:if isinstance(img, np.ndarray):return img+ if isinstance(img, Image.Image):+ return np.array(img)+raise LoadImageError(f"{type(img)} is not supported!")- def convert_img(self, img: np.ndarray):+ def convert_img(self, img: np.ndarray, origin_img_type):if img.ndim == 2:return cv2.cvtColor(img, cv2.COLOR_GRAY2BGR)@@ -170,31 +174,20 @@ class LoadImage:if channel == 2:return self.cvt_two_to_three(img)+ if channel == 3:+ if issubclass(origin_img_type, (str, Path, bytes, Image.Image)):+ return cv2.cvtColor(img, cv2.COLOR_RGB2BGR)+ return img+if channel == 4:return self.cvt_four_to_three(img)- if channel == 3:- return cv2.cvtColor(img, cv2.COLOR_RGB2BGR)-raise LoadImageError(f"The channel({channel}) of the img is not in [1, 2, 3, 4]")raise LoadImageError(f"The ndim({img.ndim}) of the img is not in [2, 3]")- @staticmethod- def cvt_four_to_three(img: np.ndarray) -> np.ndarray:- """RGBA β BGR"""- r, g, b, a = cv2.split(img)- new_img = cv2.merge((b, g, r))-- not_a = cv2.bitwise_not(a)- not_a = cv2.cvtColor(not_a, cv2.COLOR_GRAY2BGR)-- new_img = cv2.bitwise_and(new_img, new_img, mask=a)- new_img = cv2.add(new_img, not_a)- return new_img-@staticmethoddef cvt_two_to_three(img: np.ndarray) -> np.ndarray:"""gray + alpha β BGR"""@@ -209,6 +202,19 @@ class LoadImage:new_img = cv2.add(new_img, not_a)return new_img+ @staticmethod+ def cvt_four_to_three(img: np.ndarray) -> np.ndarray:+ """RGBA β BGR"""+ r, g, b, a = cv2.split(img)+ new_img = cv2.merge((b, g, r))++ not_a = cv2.bitwise_not(a)+ not_a = cv2.cvtColor(not_a, cv2.COLOR_GRAY2BGR)++ new_img = cv2.bitwise_and(new_img, new_img, mask=a)+ new_img = cv2.add(new_img, not_a)+ return new_img+@staticmethoddef verify_exist(file_path: Union[str, Path]):if not Path(file_path).exists():diff --git a/python/tests/test_ort.py b/python/tests/test_ort.pyindex 3e70514..ca0e993 100644--- a/python/tests/test_ort.py+++ b/python/tests/test_ort.py@@ -76,7 +76,6 @@ def test_cls_rec():def test_det_cls_rec():img = cv2.imread(str(img_path))- img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)result, _ = engine(img)assert result[0][1] == "ζ£εδΏι"diff --git a/python/tests/test_paddle.py b/python/tests/test_paddle.pyindex c370001..403d183 100644--- a/python/tests/test_paddle.py+++ b/python/tests/test_paddle.py@@ -76,7 +76,6 @@ def test_cls_rec():def test_det_cls_rec():img = cv2.imread(str(img_path))- img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)result, _ = engine(img)assert result[0][1] == "ζ£εδΏι"diff --git a/python/tests/test_vino.py b/python/tests/test_vino.pyindex db8e2a0..3ea998e 100644--- a/python/tests/test_vino.py+++ b/python/tests/test_vino.py@@ -76,7 +76,6 @@ def test_cls_rec():def test_det_cls_rec():img = cv2.imread(str(img_path))- img = cv2.cvtColor(img, cv2.COLOR_BGR2RGB)result, _ = engine(img)assert result[0][1] == "ζ£εδΏι"