Skip to content

Commit

Permalink
Merge pull request #7 from PaddlePaddle/develop
Browse files Browse the repository at this point in the history
update-2020-7-29
  • Loading branch information
BeyondYourself committed Jul 29, 2020
2 parents 036e113 + 301aac1 commit 701adba
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions ppocr/utils/utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import logging
import os
import imghdr


def initial_logger():
Expand Down Expand Up @@ -61,13 +62,14 @@ def get_image_file_list(img_file):
if img_file is None or not os.path.exists(img_file):
raise Exception("not found any img file in {}".format(img_file))

img_end = ['jpg', 'png', 'jpeg', 'JPEG', 'JPG', 'bmp']
if os.path.isfile(img_file) and img_file.split('.')[-1] in img_end:
img_end = {'jpg', 'bmp', 'png', 'jpeg', 'rgb', 'tif', 'tiff'}
if os.path.isfile(img_file) and imghdr.what(img_file) in img_end:
imgs_lists.append(img_file)
elif os.path.isdir(img_file):
for single_file in os.listdir(img_file):
if single_file.split('.')[-1] in img_end:
imgs_lists.append(os.path.join(img_file, single_file))
file_path = os.path.join(img_file, single_file)
if imghdr.what(file_path) in img_end:
imgs_lists.append(file_path)
if len(imgs_lists) == 0:
raise Exception("not found any img file in {}".format(img_file))
return imgs_lists
Expand Down

0 comments on commit 701adba

Please sign in to comment.