Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better error message when there is a glyph mismatch

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-07 06:41:14 +05:30
parent c668fec87b
commit 2207a86ea7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/utils/fonts/sfnt/merge.py
View File

@ -8,6 +8,10 @@ from collections import OrderedDict
from functools import partial from functools import partial
class GlyphSizeMismatch(ValueError):
pass
def merge_truetype_fonts_for_pdf(*fonts): def merge_truetype_fonts_for_pdf(*fonts):
# only merges the glyf and loca tables, ignoring all other tables # only merges the glyf and loca tables, ignoring all other tables
all_glyphs = {} all_glyphs = {}
@ -24,7 +28,7 @@ def merge_truetype_fonts_for_pdf(*fonts):
all_glyphs[glyph_id] = glyf.glyph_data(offset, sz, as_raw=True) all_glyphs[glyph_id] = glyf.glyph_data(offset, sz, as_raw=True)
else: else:
if sz != len(prev_glyph_data): if sz != len(prev_glyph_data):
raise Exception('Size mismatch for glyph id: {}'.format(glyph_id)) raise GlyphSizeMismatch('Size mismatch for glyph id: {} prev_sz: {} sz: {}'.format(glyph_id, len(prev_glyph_data), sz))
glyf = ans[b'glyf'] glyf = ans[b'glyf']
head = ans[b'head'] head = ans[b'head']