cxllm-vendors/stable-diffusion-webui-forge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix XYZ grid with Pillow >=10.0.0

Browse Source
This commit is contained in:
Panchovix
2025-07-30 21:33:17 -04:00
committed by GitHub
parent 4fbf54acd0
commit ab9c2e2b27
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/images.py
+11
View File
@@ -13,6 +13,8 @@ import numpy as np
import piexif import piexif
import piexif.helper import piexif.helper
from PIL import Image, ImageFont, ImageDraw, ImageColor, PngImagePlugin, ImageOps from PIL import Image, ImageFont, ImageDraw, ImageColor, PngImagePlugin, ImageOps
from PIL import __version__ as pillow_version
from pkg_resources import parse_version
# pillow_avif needs to be imported somewhere in code for it to work # pillow_avif needs to be imported somewhere in code for it to work
import pillow_avif # noqa: F401 import pillow_avif # noqa: F401
import string import string
@@ -168,6 +170,15 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):
for line in lines: for line in lines:
fnt = initial_fnt fnt = initial_fnt
fontsize = initial_fontsize fontsize = initial_fontsize
if parse_version(pillow_version) >= parse_version('10.0.0'):
# New code for Pillow 10.0.0+
text_width, text_height = drawing.multiline_textbbox((0, 0), line.text, font=fnt)[2:]
while text_width > line.allowed_width and fontsize > 0:
fontsize -= 1
fnt = get_font(fontsize)
text_width, text_height = drawing.multiline_textbbox((0, 0), line.text, font=fnt)[2:]
else:
# Old code for Pillow versions below 10.0.0
while drawing.multiline_textsize(line.text, font=fnt)[0] > line.allowed_width and fontsize > 0: while drawing.multiline_textsize(line.text, font=fnt)[0] > line.allowed_width and fontsize > 0:
fontsize -= 1 fontsize -= 1
fnt = get_font(fontsize) fnt = get_font(fontsize)