From 508ca6bc5af2ee60d1104b173c491dfece710b22 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 9 Nov 2012 14:24:16 +0530 Subject: [PATCH] ... --- src/calibre/utils/fonts/sfnt/cff/table.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/utils/fonts/sfnt/cff/table.py b/src/calibre/utils/fonts/sfnt/cff/table.py index d2af8da35d..63d85b65ec 100644 --- a/src/calibre/utils/fonts/sfnt/cff/table.py +++ b/src/calibre/utils/fonts/sfnt/cff/table.py @@ -102,7 +102,7 @@ class Index(list): offset += 1 if self.offset_size == 3: offsets = [unpack(b'>L', b'\0' + raw[i:i+3])[0] - for i in xrange(offset, offset+3*(count+2), 3)] + for i in xrange(offset, offset+3*(count+1), 3)] else: fmt = {1:'B', 2:'H', 4:'L'}[self.offset_size] fmt = ('>%d%s'%(count+1, fmt)).encode('ascii') @@ -156,8 +156,8 @@ class Charset(list): is_two_byte=False): fmt = b'>2H' if is_two_byte else b'>HB' sz = calcsize(fmt) - count = 0 - while count < num_glyphs - 1: + count = 1 + while count < num_glyphs: first, nleft = unpack_from(fmt, raw, offset) offset += sz count += nleft + 1