mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-09 08:43:10 +02:00
Fix #1886. Handle invalid non-numeric font-size values.
This commit is contained in:
parent
42a4ed14ca
commit
f1ba77d172
1 changed files with 4 additions and 0 deletions
|
|
@ -37,6 +37,8 @@ def __init__(self, sbase, dbase, dkey):
|
|||
|
||||
@staticmethod
|
||||
def relate(size, base):
|
||||
if size == 0:
|
||||
return base
|
||||
size = float(size)
|
||||
base = float(base)
|
||||
if abs(size - base) < 0.1: return 0
|
||||
|
|
@ -48,6 +50,7 @@ def relate(size, base):
|
|||
return result
|
||||
|
||||
def __getitem__(self, ssize):
|
||||
ssize = asfloat(ssize, 0)
|
||||
if ssize in self.cache:
|
||||
return self.cache[ssize]
|
||||
dsize = self.map(ssize)
|
||||
|
|
@ -66,6 +69,7 @@ def __init__(self, sbase, dbase):
|
|||
self.dscale = float(dbase) / float(sbase)
|
||||
|
||||
def __getitem__(self, ssize):
|
||||
ssize = asfloat(ssize, 0)
|
||||
dsize = ssize * self.dscale
|
||||
return dsize
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue