DFLIMG refactoring

This commit is contained in:
Colombo 2020-03-21 01:18:15 +04:00
commit efe3b56683
12 changed files with 175 additions and 547 deletions

View file

@ -171,7 +171,7 @@ class FaceSamplesLoaderSubprocessor(Subprocessor):
idx, filename = data
dflimg = DFLIMG.load (Path(filename))
if dflimg is None:
if dflimg is None or not dflimg.has_data():
self.log_err (f"FaceSamplesLoader: {filename} is not a dfl image file.")
data = None
else:

View file

@ -57,10 +57,7 @@ class SampleProcessor(object):
h,w,c = sample_bgr.shape
def get_full_face_mask():
if sample.eyebrows_expand_mod is not None:
full_face_mask = LandmarksProcessor.get_image_hull_mask (sample_bgr.shape, sample_landmarks, eyebrows_expand_mod=sample.eyebrows_expand_mod )
else:
full_face_mask = LandmarksProcessor.get_image_hull_mask (sample_bgr.shape, sample_landmarks)
full_face_mask = LandmarksProcessor.get_image_hull_mask (sample_bgr.shape, sample_landmarks, eyebrows_expand_mod=sample.eyebrows_expand_mod )
return np.clip(full_face_mask, 0, 1)
def get_eyes_mask():