Merge pull request AUTOMATIC1111#16751 from Neokmi/master

Fix  Codeformer and gfpgan extension , Inconsistent overlay layer types when visibility value is less than 1

Author: w-e-w

scripts/postprocessing_codeformer.py

@@ -29,6 +29,10 @@ def process(self, pp: scripts_postprocessing.PostprocessedImage, enable, codefor
         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

scripts/postprocessing_gfpgan.py

@@ -26,6 +26,10 @@ def process(self, pp: scripts_postprocessing.PostprocessedImage, enable, gfpgan_
         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