Merge branch 'master' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into Base

1 files changed, 7 insertions, 3 deletions

diff --git a/modules/extras.py b/modules/extras.py
index ffae7d67..3d9d9f7a 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -36,6 +36,7 @@ def run_extras(image, image_folder, gfpgan_visibility, codeformer_visibility, co
 

     outpath = opts.outdir_samples or opts.outdir_extras_samples

 

+    outputs = []

     for image in imageArr:

         existing_pnginfo = image.info or {}

 

@@ -91,7 +92,9 @@ def run_extras(image, image_folder, gfpgan_visibility, codeformer_visibility, co
 

         images.save_image(image, path=outpath, basename="", seed=None, prompt=None, extension=opts.samples_format, info=info, short_filename=True, no_prompt=True, grid=False, pnginfo_section_name="extras", existing_info=existing_pnginfo)

 

-    return imageArr, plaintext_to_html(info), ''

+        outputs.append(image)

+

+    return outputs, plaintext_to_html(info), ''

 

 

 def run_pnginfo(image):

@@ -108,8 +111,9 @@ def run_pnginfo(image):
 

         items['exif comment'] = exif_comment

 

-        for field in ['jfif', 'jfif_version', 'jfif_unit', 'jfif_density', 'dpi', 'exif']:

-            del items[field]

+        for field in ['jfif', 'jfif_version', 'jfif_unit', 'jfif_density', 'dpi', 'exif',

+                      'loop', 'background', 'timestamp', 'duration']:

+            items.pop(field, None)

 

 

     info = ''