浏览代码

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

Aarni Koskela 2 年之前
父节点
当前提交
1332c46b71
共有 5 个文件被更改,包括 5 次插入7 次删除
  1. 二进制
      modules/Roboto-Regular.ttf
  2. 3 3
      modules/images.py
  3. 2 0
      modules/paths_internal.py
  4. 0 2
      requirements.txt
  5. 0 2
      requirements_versions.txt

二进制
modules/Roboto-Regular.ttf


+ 3 - 3
modules/images.py

@@ -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):

+ 2 - 0
modules/paths_internal.py

@@ -22,3 +22,5 @@ models_path = os.path.join(data_path, "models")
 extensions_dir = os.path.join(data_path, "extensions")
 extensions_builtin_dir = os.path.join(script_path, "extensions-builtin")
 config_states_dir = os.path.join(script_path, "config_states")
+
+roboto_ttf_file = os.path.join(modules_path, 'Roboto-Regular.ttf')

+ 0 - 2
requirements.txt

@@ -2,8 +2,6 @@ astunparse
 blendmodes
 accelerate
 basicsr
-fonts
-font-roboto
 gfpgan
 gradio==3.29.0
 numpy

+ 0 - 2
requirements_versions.txt

@@ -11,8 +11,6 @@ torch
 omegaconf==2.2.3
 pytorch_lightning==1.9.4
 scikit-image==0.19.2
-fonts
-font-roboto
 timm==0.6.7
 piexif==1.1.3
 einops==0.4.1