fix original images

This commit is contained in:
Pei-Yun Sun 2020-10-16 23:14:11 +11:00
parent 47733dc7a6
commit 1d08a40348
3 changed files with 365 additions and 53 deletions

View File

@ -511,9 +511,7 @@ def analyze(img_path, actions = [], models = {}, enforce_detection = True, detec
return resp_objects, orig_faces
def detectFace(img_path, detector_backend='opencv'):
imgs = functions.preprocess_face(img=img_path, detector_backend=detector_backend)['processed'] #preprocess_face returns (1, 224, 224, 3)
for i in range(len(imgs)):
imgs[i] = imgs[i][0][:, :, ::-1] #bgr to rgb
imgs = functions.preprocess_face(img=img_path, detector_backend=detector_backend)['original'] #preprocess_face returns (1, 224, 224, 3)
return imgs
def find(img_path, db_path, model_name ='VGG-Face', distance_metric = 'cosine', model = None, enforce_detection = True, detector_backend = 'opencv'):

View File

@ -470,6 +470,7 @@ def preprocess_face(img, target_size=(224, 224), grayscale=False, enforce_detect
imgs = detect_face(img=img, detector_backend=detector_backend, grayscale=grayscale,
enforce_detection=enforce_detection)
orig = imgs.copy()
# --------------------------
@ -505,7 +506,7 @@ def preprocess_face(img, target_size=(224, 224), grayscale=False, enforce_detect
pixels.append(img_pixels)
return {'processed': pixels, 'original': imgs}
return {'processed': pixels, 'original': orig}
def allocateMemory():

File diff suppressed because one or more lines are too long