瀏覽代碼

Merge pull request #16751 from Neokmi/master

Fix  Codeformer and gfpgan extension , Inconsistent overlay layer types when visibility value is less than 1
w-e-w 7 月之前
父節點
當前提交
1a773bf2c8
共有 2 個文件被更改,包括 8 次插入0 次删除
  1. 4 0
      scripts/postprocessing_codeformer.py
  2. 4 0
      scripts/postprocessing_gfpgan.py

+ 4 - 0
scripts/postprocessing_codeformer.py

@@ -29,6 +29,10 @@ class ScriptPostprocessingCodeFormer(scripts_postprocessing.ScriptPostprocessing
         res = Image.fromarray(restored_img)
 
         if codeformer_visibility < 1.0:
+            if pp.image.size != res.size:
+                res = res.resize(pp.image.size)
+            if pp.image.mode != res.mode:
+                res = res.convert(pp.image.mode)
             res = Image.blend(pp.image, res, codeformer_visibility)
 
         pp.image = res

+ 4 - 0
scripts/postprocessing_gfpgan.py

@@ -26,6 +26,10 @@ class ScriptPostprocessingGfpGan(scripts_postprocessing.ScriptPostprocessing):
         res = Image.fromarray(restored_img)
 
         if gfpgan_visibility < 1.0:
+            if pp.image.size != res.size:
+                res = res.resize(pp.image.size)
+            if pp.image.mode != res.mode:
+                res = res.convert(pp.image.mode)
             res = Image.blend(pp.image, res, gfpgan_visibility)
 
         pp.image = res