From 4499d009792c99e7ab9c5f243b4417ccf54ab396 Mon Sep 17 00:00:00 2001 From: Jeremy Hummel Date: Wed, 25 Sep 2019 23:28:32 -0700 Subject: [PATCH] Fix mask editor bugs --- mainscripts/MaskEditorTool.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mainscripts/MaskEditorTool.py b/mainscripts/MaskEditorTool.py index 453004d..e606d35 100644 --- a/mainscripts/MaskEditorTool.py +++ b/mainscripts/MaskEditorTool.py @@ -25,9 +25,9 @@ class MaskEditor: self.img = imagelib.normalize_channels (img,3) h, w, c = img.shape - if h != w or w != 256: - self.img = cv2.resize(img, (256,256)) - raise Exception ("MaskEditor does not support image size != 256x256") + # if h != w or w != 256: + # self.img = cv2.resize(img, (256,256)) + # raise Exception ("MaskEditor does not support image size != 256x256") ph, pw = h // 4, w // 4 #pad wh @@ -257,7 +257,7 @@ class MaskEditor: preview_images += [ np.concatenate (prev_images, axis=1) ] 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 ] @@ -333,7 +333,7 @@ def mask_editor_main(input_dir, confirmed_dir=None, skipped_dir=None, no_default if not skipped_path.exists(): skipped_path.mkdir(parents=True) - + 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 else: