From c4f81de40e17bda1a91f7d663642f8545a4ef18a Mon Sep 17 00:00:00 2001 From: Brigham Lysenko Date: Thu, 22 Aug 2019 16:01:06 -0600 Subject: [PATCH] added mask editor support --- mainscripts/Extractor.py | 1 + mainscripts/MaskEditorTool.py | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mainscripts/Extractor.py b/mainscripts/Extractor.py index 894daa6..1a022ae 100644 --- a/mainscripts/Extractor.py +++ b/mainscripts/Extractor.py @@ -561,6 +561,7 @@ class ExtractSubprocessor(Subprocessor): self.landmarks = landmarks[0] (h,w,c) = self.image.shape + self.image_size = h if not self.hide_help: image = cv2.addWeighted (self.image,1.0,self.text_lines_img,1.0,0) diff --git a/mainscripts/MaskEditorTool.py b/mainscripts/MaskEditorTool.py index 1d9750f..dd30760 100644 --- a/mainscripts/MaskEditorTool.py +++ b/mainscripts/MaskEditorTool.py @@ -25,8 +25,8 @@ class MaskEditor: self.img = imagelib.normalize_channels (img,3) h, w, c = img.shape - if h != w and w != 256: - #to support any square res, scale img,mask and ie_polys to 256, then scale ie_polys back on .get_ie_polys() + 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, max_wh_bordered ) + img[border:-border,border:-border] = cv2.resize( self.img, 256 ) preview_images += [ img ] @@ -276,7 +276,6 @@ class MaskEditor: self.preview_images = np.clip(preview_images * 255, 0, 255 ).astype(np.uint8) status_img = self.get_screen_status_block( screens.shape[1], screens.shape[2] ) - result = np.concatenate ( [self.preview_images, screens, status_img], axis=0 ) return result