aboutsummaryrefslogtreecommitdiffstats
path: root/modules/postprocessing.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-04-29 13:10:16 +0000
committerGitHub <noreply@github.com>2023-04-29 13:10:16 +0000
commit725a3849d2761d40808899e9b1bcf594dd33109d (patch)
tree657962e52bbc50e3bd51ea292e616c2372501d58 /modules/postprocessing.py
parentc84118d70d7c3dd2f741f9e89b9a8a4643f27f98 (diff)
parent8863b31d83b527d041ca45e23b9af99e2346081a (diff)
downloadstable-diffusion-webui-gfx803-725a3849d2761d40808899e9b1bcf594dd33109d.tar.gz
stable-diffusion-webui-gfx803-725a3849d2761d40808899e9b1bcf594dd33109d.tar.bz2
stable-diffusion-webui-gfx803-725a3849d2761d40808899e9b1bcf594dd33109d.zip
Merge branch 'dev' into pr/xyz-sort-001
Diffstat (limited to 'modules/postprocessing.py')
-rw-r--r--modules/postprocessing.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index 09d8e605..4dc1a2ab 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -18,9 +18,15 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
if extras_mode == 1:
for img in image_folder:
- image = Image.open(img)
+ if isinstance(img, Image.Image):
+ image = img
+ fn = ''
+ else:
+ image = Image.open(os.path.abspath(img.name))
+ fn = os.path.splitext(img.orig_name)[0]
+
image_data.append(image)
- image_names.append(os.path.splitext(img.orig_name)[0])
+ image_names.append(fn)
elif extras_mode == 2:
assert not shared.cmd_opts.hide_ui_dir_config, '--hide-ui-dir-config option must be disabled'
assert input_dir, 'input directory not selected'