Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:修复通道数不匹配造成的PPOCRLabel启动失败问题#10748,根据更新日志发现#10655,由于paddleocr中增加了对… #10847

Merged
merged 1 commit into from
Sep 21, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions paddleocr.py
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,19 @@ def img_decode(content: bytes):
return cv2.imdecode(np_arr, cv2.IMREAD_UNCHANGED)


def check_img(img):
def check_img(img, alpha_color=(255, 255, 255)):
"""
Check the image data. If it is another type of image file, try to decode it into a numpy array.
The inference network requires three-channel images, So the following channel conversions are done
single channel image: Gray to RGB R←Y,G←Y,B←Y
four channel image: alpha_to_color
args:
img: image data
file format: jpg, png and other image formats that opencv can decode, as well as gif and pdf formats
storage type: binary image, net image file, local image file
alpha_color: Background color in images in RGBA format
return: numpy.array (h, w, 3)
"""
if isinstance(img, bytes):
img = img_decode(img)
if isinstance(img, str):
Expand Down Expand Up @@ -550,9 +562,12 @@ def check_img(img):
if img is None:
logger.error("error in loading image:{}".format(image_file))
return None
# single channel image array.shape:h,w
if isinstance(img, np.ndarray) and len(img.shape) == 2:
img = cv2.cvtColor(img, cv2.COLOR_GRAY2BGR)

# four channel image array.shape:h,w,c
if isinstance(img, np.ndarray) and len(img.shape) == 3 and img.shape[2] == 4:
img = alpha_to_color(img, alpha_color)
return img


Expand Down Expand Up @@ -638,7 +653,7 @@ def ocr(self, img, det=True, rec=True, cls=True, bin=False, inv=False, alpha_col
'Since the angle classifier is not initialized, it will not be used during the forward process'
)

img = check_img(img)
img = check_img(img, alpha_color)
# for infer pdf file
if isinstance(img, list):
if self.page_num > len(img) or self.page_num == 0:
Expand All @@ -648,7 +663,6 @@ def ocr(self, img, det=True, rec=True, cls=True, bin=False, inv=False, alpha_col
imgs = [img]

def preprocess_image(_image):
_image = alpha_to_color(_image, alpha_color)
if inv:
_image = cv2.bitwise_not(_image)
if bin:
Expand Down Expand Up @@ -755,8 +769,8 @@ def __init__(self, **kwargs):
logger.debug(params)
super().__init__(params)

def __call__(self, img, return_ocr_result_in_table=False, img_idx=0):
img = check_img(img)
def __call__(self, img, return_ocr_result_in_table=False, img_idx=0, alpha_color=(255, 255, 255)):
img = check_img(img, alpha_color)
res, _ = super().__call__(
img, return_ocr_result_in_table, img_idx=img_idx)
return res
Expand Down