mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2024-12-29 19:05:05 +08:00
stylistic changes for #15978
This commit is contained in:
parent
981abbb1f2
commit
e368cd2810
@ -377,7 +377,7 @@ def get_sampler_scheduler(p, sampler):
|
|||||||
|
|
||||||
class FilenameGenerator:
|
class FilenameGenerator:
|
||||||
replacements = {
|
replacements = {
|
||||||
'basename': lambda self: 'img' if self.basename == '' else self.basename,
|
'basename': lambda self: self.basename or 'img',
|
||||||
'seed': lambda self: self.seed if self.seed is not None else '',
|
'seed': lambda self: self.seed if self.seed is not None else '',
|
||||||
'seed_first': lambda self: self.seed if self.p.batch_size == 1 else self.p.all_seeds[0],
|
'seed_first': lambda self: self.seed if self.p.batch_size == 1 else self.p.all_seeds[0],
|
||||||
'seed_last': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.batch_size == 1 else self.p.all_seeds[-1],
|
'seed_last': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.batch_size == 1 else self.p.all_seeds[-1],
|
||||||
@ -651,7 +651,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
|
|||||||
txt_fullfn (`str` or None):
|
txt_fullfn (`str` or None):
|
||||||
If a text file is saved for this image, this will be its full path. Otherwise None.
|
If a text file is saved for this image, this will be its full path. Otherwise None.
|
||||||
"""
|
"""
|
||||||
namegen = FilenameGenerator(p, seed, prompt, image, zip=False, basename=basename)
|
namegen = FilenameGenerator(p, seed, prompt, image, basename=basename)
|
||||||
|
|
||||||
# WebP and JPG formats have maximum dimension limits of 16383 and 65535 respectively. switch to PNG which has a much higher limit
|
# WebP and JPG formats have maximum dimension limits of 16383 and 65535 respectively. switch to PNG which has a much higher limit
|
||||||
if (image.height > 65535 or image.width > 65535) and extension.lower() in ("jpg", "jpeg") or (image.height > 16383 or image.width > 16383) and extension.lower() == "webp":
|
if (image.height > 65535 or image.width > 65535) and extension.lower() in ("jpg", "jpeg") or (image.height > 16383 or image.width > 16383) and extension.lower() == "webp":
|
||||||
|
Loading…
Reference in New Issue
Block a user