aboutsummaryrefslogtreecommitdiffstats
path: root/modules/postprocessing.py
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-04-29 06:30:33 +0000
committerGitHub <noreply@github.com>2023-04-29 06:30:33 +0000
commita33d49cc572214494e1e5f1fdcc4f422b370eae1 (patch)
treedd4e0baa7eb4a256f2bd74dd917abd56e604a37a /modules/postprocessing.py
parentc19618f37059b425b1e53429ad8def2caa78cdec (diff)
parent7fc10e04456878ac4e0881dbfe56c8966e22f40d (diff)
downloadstable-diffusion-webui-gfx803-a33d49cc572214494e1e5f1fdcc4f422b370eae1.tar.gz
stable-diffusion-webui-gfx803-a33d49cc572214494e1e5f1fdcc4f422b370eae1.tar.bz2
stable-diffusion-webui-gfx803-a33d49cc572214494e1e5f1fdcc4f422b370eae1.zip
Merge branch 'dev' into fix_batch_processing
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 c27ad8db..9cb80957 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -20,9 +20,15 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp
if extras_mode == 1:
for img in image_folder:
- image = Image.open(os.path.abspath(img.name))
+ 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'