aboutsummaryrefslogtreecommitdiffstats
path: root/modules/postprocessing.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-05-17 20:18:56 +0000
committerGitHub <noreply@github.com>2023-05-17 20:18:56 +0000
commit04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce (patch)
tree1cb30a63099a69f678d4901b495203b765a6df59 /modules/postprocessing.py
parent7201d940a4fe664beb9662fadbeade4ee1d788f7 (diff)
parentb397f63e00bbfbe9087d80abb457aa9a593b181b (diff)
downloadstable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.tar.gz
stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.tar.bz2
stable-diffusion-webui-gfx803-04b4508a66de58c9f3a422fdcad4dd2ec3ad39ce.zip
Merge branch 'dev' into improve-frontend-responsiveness
Diffstat (limited to 'modules/postprocessing.py')
-rw-r--r--modules/postprocessing.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index 09d8e605..736315e2 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -18,9 +18,14 @@ 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'