Merge branch 'dev' of https://github.com/AUTOMATIC1111/stable-diffusion-webui into tomesd

1 files changed, 4 insertions, 9 deletions

diff --git a/modules/textual_inversion/image_embedding.py b/modules/textual_inversion/image_embedding.py
index 5593f88c..5858a55f 100644
--- a/modules/textual_inversion/image_embedding.py
+++ b/modules/textual_inversion/image_embedding.py
@@ -2,10 +2,8 @@ import base64
 import json

 import numpy as np

 import zlib

-from PIL import Image, PngImagePlugin, ImageDraw, ImageFont

-from fonts.ttf import Roboto

+from PIL import Image, ImageDraw, ImageFont

 import torch

-from modules.shared import opts

 

 

 class EmbeddingEncoder(json.JSONEncoder):

@@ -17,7 +15,7 @@ class EmbeddingEncoder(json.JSONEncoder):
 

 class EmbeddingDecoder(json.JSONDecoder):

     def __init__(self, *args, **kwargs):

-        json.JSONDecoder.__init__(self, object_hook=self.object_hook, *args, **kwargs)

+        json.JSONDecoder.__init__(self, *args, object_hook=self.object_hook, **kwargs)

 

     def object_hook(self, d):

         if 'TORCHTENSOR' in d:

@@ -136,11 +134,8 @@ def caption_image_overlay(srcimage, title, footerLeft, footerMid, footerRight, t
     image = srcimage.copy()

     fontsize = 32

     if textfont is None:

-        try:

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

-            textfont = opts.font or Roboto

-        except Exception:

-            textfont = Roboto

+        from modules.images import get_font

+        textfont = get_font(fontsize)

 

     factor = 1.5

     gradient = Image.new('RGBA', (1, image.size[1]), color=(0, 0, 0, 0))