From 0549b27afbeea84646960934478d84fad815d7b0 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sat, 1 May 2021 15:12:08 -0600
Subject: [PATCH] [varLib.varStore] Implement 32bit VarStore optimization

This concludes https://github.com/fonttools/fonttools/issues/2279

Part of https://github.com/fonttools/fonttools/pull/2285
---
 Lib/fontTools/varLib/varStore.py | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/Lib/fontTools/varLib/varStore.py b/Lib/fontTools/varLib/varStore.py
index 27b6eadee..47f9e8df3 100644
--- a/Lib/fontTools/varLib/varStore.py
+++ b/Lib/fontTools/varLib/varStore.py
@@ -374,12 +374,11 @@ class _Encoding(object):
 		as a VarData."""
 		c = 6
 		while chars:
-			if chars & 3:
+			if chars & 15:
 				c += 2
-			chars >>= 2
+			chars >>= 4
 		return c
 
-
 	def _find_yourself_best_new_encoding(self, done_by_width):
 		self.best_new_encoding = None
 		for new_width in range(self.width+1, self.width+self.room+1):
@@ -404,6 +403,8 @@ class _EncodingDict(dict):
 	@staticmethod
 	def _row_characteristics(row):
 		"""Returns encoding characteristics for a row."""
+		longWords = False
+
 		chars = 0
 		i = 1
 		for v in row:
@@ -411,7 +412,22 @@ class _EncodingDict(dict):
 				chars += i
 			if not (-128 <= v <= 127):
 				chars += i * 2
-			i <<= 2
+			if not (-32768 <= v <= 32767):
+				longWords = True
+				break
+			i <<= 4
+
+		if longWords:
+			# Redo; only allow 2byte/4byte encoding
+			chars = 0
+			i = 1
+			for v in row:
+				if v:
+					chars += i * 3 # 3 = 2 | 1
+				if not (-32768 <= v <= 32767):
+					chars += i * 12 # 12 = 8 | 4
+				i <<= 4
+
 		return chars