diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-04-29 13:50:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-29 13:50:52 +0000 |
| commit | 263f0fb59c7afa9b4739b226725dd0b38956a8cf (patch) | |
| tree | 2ebe6b5e7763ab2c95aa8bd72ce6d8f6afbd87ce /modules/postprocessing.py | |
| parent | 082613036aa7b9a8a008384b1770046d6714bc28 (diff) | |
| parent | faff08f396f159a5ddd6328a6d2699b7e7d18ef9 (diff) | |
| download | stable-diffusion-webui-gfx803-263f0fb59c7afa9b4739b226725dd0b38956a8cf.tar.gz stable-diffusion-webui-gfx803-263f0fb59c7afa9b4739b226725dd0b38956a8cf.tar.bz2 stable-diffusion-webui-gfx803-263f0fb59c7afa9b4739b226725dd0b38956a8cf.zip | |
Merge branch 'dev' into remove-watermark-option
Diffstat (limited to 'modules/postprocessing.py')
| -rw-r--r-- | modules/postprocessing.py | 10 |
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'
|