|
@@ -13,12 +13,12 @@ import numpy as np
|
|
|
import piexif
|
|
|
import piexif.helper
|
|
|
from PIL import Image, ImageFont, ImageDraw, PngImagePlugin
|
|
|
-from fonts.ttf import Roboto
|
|
|
import string
|
|
|
import json
|
|
|
import hashlib
|
|
|
|
|
|
from modules import sd_samplers, shared, script_callbacks, errors
|
|
|
+from modules.paths_internal import roboto_ttf_file
|
|
|
from modules.shared import opts
|
|
|
|
|
|
LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.LANCZOS)
|
|
@@ -26,9 +26,9 @@ LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.L
|
|
|
|
|
|
def get_font(fontsize: int):
|
|
|
try:
|
|
|
- return ImageFont.truetype(opts.font or Roboto, fontsize)
|
|
|
+ return ImageFont.truetype(opts.font or roboto_ttf_file, fontsize)
|
|
|
except Exception:
|
|
|
- return ImageFont.truetype(Roboto, fontsize)
|
|
|
+ return ImageFont.truetype(roboto_ttf_file, fontsize)
|
|
|
|
|
|
|
|
|
def image_grid(imgs, batch_size=1, rows=None):
|