From d696927d7e889dbb7362229f40cdede9fa54077e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 22 May 2021 08:59:11 +0530 Subject: [PATCH] Nicer font names printout --- src/calibre/utils/fonts/sfnt/container.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/calibre/utils/fonts/sfnt/container.py b/src/calibre/utils/fonts/sfnt/container.py index a39efff445..369b54233c 100644 --- a/src/calibre/utils/fonts/sfnt/container.py +++ b/src/calibre/utils/fonts/sfnt/container.py @@ -107,11 +107,10 @@ class Sfnt(object): return ans def get_all_font_names(self): + from calibre.utils.fonts.metadata import get_font_names2, FontNames name_table = self.get(b'name') - if name_table is None: - return {} - from calibre.utils.fonts.metadata import get_font_names2 - return get_font_names2(name_table.raw, raw_is_table=True) + if name_table is not None: + return FontNames(*get_font_names2(name_table.raw, raw_is_table=True)) def __call__(self, stream=None): stream = BytesIO() if stream is None else stream