[CFF2Index] Make even faster

Load offsets on-demand as well.
fonttools · Dec 16, 2023 · 34d74fa · 34d74fa
1 parent 829e06c
commit 34d74fa
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/Lib/fontTools/ttLib/tables/otConverters.py b/Lib/fontTools/ttLib/tables/otConverters.py
@@ -1846,16 +1846,19 @@ def read(self, reader, font, tableDict):
         if count == 0:
             return []
         offSize = reader.readUInt8()
-        readArray = {
-            1: reader.readUInt8Array,
-            2: reader.readUShortArray,
-            3: reader.readUInt24Array,
-            4: reader.readULongArray,
-        }[offSize]
-        offsets = readArray(count + 1)
+
+        def getReadArray(reader, offSize):
+            return {
+                1: reader.readUInt8Array,
+                2: reader.readUShortArray,
+                3: reader.readUInt24Array,
+                4: reader.readULongArray,
+            }[offSize]
+        readArray = getReadArray(reader, offSize)
 
         lazy = font.lazy is not False and count > 8
         if not lazy:
+            offsets = readArray(count + 1)
             items = []
             lastOffset = offsets.pop(0)
             reader.readData(lastOffset)  # In case first offset is not 0
@@ -1874,8 +1877,10 @@ def read(self, reader, font, tableDict):
             return items
         else:
             def read_item(self, i):
-                self.reader.seek(self.pos + self.offsets[i])
-                item = self.reader.readData(self.offsets[i + 1] - self.offsets[i])
+                self.reader.seek(self.offset_pos + i * self.offSize)
+                offsets = self.readArray(2)
+                self.reader.seek(self.data_pos + offsets[0])
+                item = self.reader.readData(offsets[1] - offsets[0])
 
                 if self.itemClass is not None:
                     obj = self.itemClass()
@@ -1886,10 +1891,14 @@ def read_item(self, i):
 
             l = _LazyList(read_item for i in range(count))
             l.reader = reader.copy()
-            l.pos = l.reader.pos
+            l.offset_pos = l.reader.pos
+            l.data_pos = l.offset_pos + (count + 1) * offSize
             l.font = font
             l.itemClass = self.itemClass
-            l.offsets = offsets
+            l.offSize = offSize
+            l.readArray = getReadArray(l.reader, offSize)
+
+            # TODO: Advance reader
 
             return l