From e9f923b5823b47abf0eb83c341affc234ce67c56 Mon Sep 17 00:00:00 2001
From: Jan <deepartist.ai@gmail.com>
Date: Fri, 26 Nov 2021 12:21:25 +0100
Subject: [PATCH] bugfix modes

---
 core/imagelib/blursharpen.py | 2 +-
 merger/MergeMasked.py        | 9 ++++-----
 merger/MergerConfig.py       | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/imagelib/blursharpen.py b/core/imagelib/blursharpen.py
index 79ebdab..d043b2d 100644
--- a/core/imagelib/blursharpen.py
+++ b/core/imagelib/blursharpen.py
@@ -39,7 +39,7 @@ def blursharpen (img, sharpen_mode=0, kernel_size=3, amount=100):
     
 def gaussian_sharpen(img, amount=100, sigma=1.0):
     img =  cv2.addWeighted(img, 1.0 + (0.05 * amount), cv2.GaussianBlur(img, (0, 0), sigma), -(0.05 * amount), 0)
-    return np.clip(img, 0, 1, out=img)
+    return img
     
 def unsharpen_mask(img, amount=100, sigma=0.0, threshold = (5.0 / 255.0)):
     radius = max(1, round(img.shape[0] * (amount / 100)))
diff --git a/merger/MergeMasked.py b/merger/MergeMasked.py
index b088886..9522d23 100644
--- a/merger/MergeMasked.py
+++ b/merger/MergeMasked.py
@@ -61,14 +61,13 @@ def MergeMaskedFace (predictor_func, predictor_input_shape,
     dst_face_mask_a_0 = cv2.warpAffine( img_face_mask_a, face_mat, (output_size, output_size), flags=cv2.INTER_CUBIC )
     dst_face_mask_a_0 = np.clip(dst_face_mask_a_0, 0, 1)
     
-    if cfg.pre_sharpen_power != 0:
-        if cfg.pre_sharpen_mode:
+    if cfg.pre_sharpen_mode > 0 and cfg.pre_sharpen_power != 0:
+        if cfg.pre_sharpen_mode==1:
             dst_face_bgr = imagelib.gaussian_sharpen(dst_face_bgr, amount=cfg.pre_sharpen_power)
-        else:
+        elif cfg.pre_sharpen_mode==2:
             dst_face_bgr = imagelib.unsharpen_mask(dst_face_bgr, amount=cfg.pre_sharpen_power)
 
-        #dst_face_bgr      = cv2.addWeighted(dst_face_bgr, 1.0 + (0.05 * cfg.pre_sharpen_power), cv2.GaussianBlur(dst_face_bgr, (0, 0), 1.0), -(0.05 * cfg.pre_sharpen_power), 0)
-        #dst_face_bgr      = np.clip(dst_face_bgr, 0, 1, out=dst_face_bgr)
+        dst_face_bgr = np.clip(dst_face_bgr, 0, 1, out=dst_face_bgr)
 
     predictor_input_bgr      = cv2.resize (dst_face_bgr, (input_size,input_size) )
 
diff --git a/merger/MergerConfig.py b/merger/MergerConfig.py
index 2278edb..1f0e871 100644
--- a/merger/MergerConfig.py
+++ b/merger/MergerConfig.py
@@ -97,7 +97,7 @@ mask_mode_dict = {0:'full',
 ctm_dict = { 0: "None", 1:"rct", 2:"lct", 3:"mkl", 4:"mkl-m", 5:"idt", 6:"idt-m", 7:"sot-m", 8:"mix-m" }
 ctm_str_dict = {None:0, "rct":1, "lct":2, "mkl":3, "mkl-m":4, "idt":5, "idt-m":6, "sot-m":7, "mix-m":8 }
 
-pre_sharpen_dict = {0:'gaussian', 1:'unsharpen_mask'}
+pre_sharpen_dict = {0:"None", 1:'gaussian', 2:'unsharpen_mask'}
 
 
 class MergerConfigMasked(MergerConfig):