diff options
| author | InvincibleDude <81354513+InvincibleDude@users.noreply.github.com> | 2023-01-29 11:36:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-29 11:36:10 +0000 |
| commit | ee3d63b6beb88e63542976a1095d4c8aa97388bd (patch) | |
| tree | cf891130682c343107ae0a0f8cec309aea16807a /modules/images.py | |
| parent | 44c0e6b993d00bb2f441f0fde409bcb79136f034 (diff) | |
| parent | 00dab8f10defbbda579a1bc89c8d4e972c58a20d (diff) | |
| download | stable-diffusion-webui-gfx803-ee3d63b6beb88e63542976a1095d4c8aa97388bd.tar.gz stable-diffusion-webui-gfx803-ee3d63b6beb88e63542976a1095d4c8aa97388bd.tar.bz2 stable-diffusion-webui-gfx803-ee3d63b6beb88e63542976a1095d4c8aa97388bd.zip | |
Merge branch 'master' into master
Diffstat (limited to 'modules/images.py')
| -rw-r--r-- | modules/images.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/images.py b/modules/images.py index 3b1c5f34..ae3cdaf4 100644 --- a/modules/images.py +++ b/modules/images.py @@ -36,6 +36,8 @@ def image_grid(imgs, batch_size=1, rows=None): else:
rows = math.sqrt(len(imgs))
rows = round(rows)
+ if rows > len(imgs):
+ rows = len(imgs)
cols = math.ceil(len(imgs) / rows)
@@ -195,7 +197,7 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts): ver_text_heights = [sum([line.size[1] + line_spacing for line in lines]) - line_spacing * len(lines) for lines in
ver_texts]
- pad_top = max(hor_text_heights) + line_spacing * 2
+ pad_top = 0 if sum(hor_text_heights) == 0 else max(hor_text_heights) + line_spacing * 2
result = Image.new("RGB", (im.width + pad_left, im.height + pad_top), "white")
result.paste(im, (pad_left, pad_top))
|