Merge pull request #10273 from AUTOMATIC1111/roboto-without-a-dep

Vendor Roboto font

1 files changed, 8 insertions, 7 deletions

diff --git a/modules/images.py b/modules/images.py
index c4e98c75..3b8b62d9 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -13,17 +13,24 @@ 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)

 

 

+def get_font(fontsize: int):

+    try:

+        return ImageFont.truetype(opts.font or roboto_ttf_file, fontsize)

+    except Exception:

+        return ImageFont.truetype(roboto_ttf_file, fontsize)

+

+

 def image_grid(imgs, batch_size=1, rows=None):

     if rows is None:

         if opts.n_rows > 0:

@@ -142,12 +149,6 @@ def draw_grid_annotations(im, width, height, hor_texts, ver_texts, margin=0):
                 lines.append(word)

         return lines

 

-    def get_font(fontsize):

-        try:

-            return ImageFont.truetype(opts.font or Roboto, fontsize)

-        except Exception:

-            return ImageFont.truetype(Roboto, fontsize)

-

     def draw_texts(drawing, draw_x, draw_y, lines, initial_fnt, initial_fontsize):

         for line in lines:

             fnt = initial_fnt