github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-08-22 22:34:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #78 from faceshiftlabs/fix/mask-editor-bugs

Browse source 
Fix mask editor bugs
This commit is contained in:
Jeremy Hummel 2019-09-25 23:29:23 -07:00 • committed by GitHub
commit 265fc9fafb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
mainscripts/MaskEditorTool.py
View file

@ -25,9 +25,9 @@ class MaskEditor:
self.img = imagelib.normalize_channels (img,3) self.img = imagelib.normalize_channels (img,3)
h, w, c = img.shape h, w, c = img.shape
if h != w or w != 256: # if h != w or w != 256:
self.img = cv2.resize(img, (256,256)) # self.img = cv2.resize(img, (256,256))
raise Exception ("MaskEditor does not support image size != 256x256") # raise Exception ("MaskEditor does not support image size != 256x256")
ph, pw = h // 4, w // 4 #pad wh ph, pw = h // 4, w // 4 #pad wh
@ -257,7 +257,7 @@ class MaskEditor:
preview_images += [ np.concatenate (prev_images, axis=1) ] preview_images += [ np.concatenate (prev_images, axis=1) ]
img = np.full ( (prh,prw, sc), (0,0,1), dtype=np.float ) img = np.full ( (prh,prw, sc), (0,0,1), dtype=np.float )
img[border:-border,border:-border] = cv2.resize( self.img, 256 ) img[border:-border,border:-border] = cv2.resize(self.img, (self.prwh - 2*border, self.prwh - 2*border))
preview_images += [ img ] preview_images += [ img ]
@ -333,7 +333,7 @@ def mask_editor_main(input_dir, confirmed_dir=None, skipped_dir=None, no_default
if not skipped_path.exists(): if not skipped_path.exists():
skipped_path.mkdir(parents=True) skipped_path.mkdir(parents=True)
if not no_default_mask: if not no_default_mask:
eyebrows_expand_mod = np.clip ( io.input_int ("Default eyebrows expand modifier? (0..400, skip:100) : ", 100), 0, 400 ) / 100.0 eyebrows_expand_mod = np.clip ( io.input_int ("Default eyebrows expand modifier? (0..400, skip:100) : ", 100), 0, 400 ) / 100.0
else: else: