Commit 1332c46b authored by Aarni Koskela's avatar Aarni Koskela

Drop fonts + font-roboto deps since we only use the single regular cut of Roboto

parent df7070ec
...@@ -13,12 +13,12 @@ import numpy as np ...@@ -13,12 +13,12 @@ import numpy as np
import piexif import piexif
import piexif.helper import piexif.helper
from PIL import Image, ImageFont, ImageDraw, PngImagePlugin from PIL import Image, ImageFont, ImageDraw, PngImagePlugin
from fonts.ttf import Roboto
import string import string
import json import json
import hashlib import hashlib
from modules import sd_samplers, shared, script_callbacks, errors from modules import sd_samplers, shared, script_callbacks, errors
from modules.paths_internal import roboto_ttf_file
from modules.shared import opts from modules.shared import opts
LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.LANCZOS) 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 ...@@ -26,9 +26,9 @@ LANCZOS = (Image.Resampling.LANCZOS if hasattr(Image, 'Resampling') else Image.L
def get_font(fontsize: int): def get_font(fontsize: int):
try: try:
return ImageFont.truetype(opts.font or Roboto, fontsize) return ImageFont.truetype(opts.font or roboto_ttf_file, fontsize)
except Exception: except Exception:
return ImageFont.truetype(Roboto, fontsize) return ImageFont.truetype(roboto_ttf_file, fontsize)
def image_grid(imgs, batch_size=1, rows=None): def image_grid(imgs, batch_size=1, rows=None):
......
...@@ -22,3 +22,5 @@ models_path = os.path.join(data_path, "models") ...@@ -22,3 +22,5 @@ models_path = os.path.join(data_path, "models")
extensions_dir = os.path.join(data_path, "extensions") extensions_dir = os.path.join(data_path, "extensions")
extensions_builtin_dir = os.path.join(script_path, "extensions-builtin") extensions_builtin_dir = os.path.join(script_path, "extensions-builtin")
config_states_dir = os.path.join(script_path, "config_states") config_states_dir = os.path.join(script_path, "config_states")
roboto_ttf_file = os.path.join(modules_path, 'Roboto-Regular.ttf')
...@@ -2,8 +2,6 @@ astunparse ...@@ -2,8 +2,6 @@ astunparse
blendmodes blendmodes
accelerate accelerate
basicsr basicsr
fonts
font-roboto
gfpgan gfpgan
gradio==3.29.0 gradio==3.29.0
numpy numpy
......
...@@ -11,8 +11,6 @@ torch ...@@ -11,8 +11,6 @@ torch
omegaconf==2.2.3 omegaconf==2.2.3
pytorch_lightning==1.9.4 pytorch_lightning==1.9.4
scikit-image==0.19.2 scikit-image==0.19.2
fonts
font-roboto
timm==0.6.7 timm==0.6.7
piexif==1.1.3 piexif==1.1.3
einops==0.4.1 einops==0.4.1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment